1. Taking care of comment to prevent extra trash allocation
2. Somehow BufferPool got build time changes committed when it should have remained unchanged...