IBuffer management tweaks