fix minor gcc-specific issues with recent BlockAllocation chagnges