changes needed to get map_blocks to actually compile :-(