Fix problems with low level buffer