More map-bounds fixes