minor optimisations and cleanups when creating new buffers