Further multiple article buffer fixes