More fixes for switch to new buffer interface