Buffers improvements