Several fixes for the buffer code.