A bit more work on the buffer pool