BufferManager improvements