BuffPool fixing/updates