Some modifications in the Buffer manager logic