More map_logic fixes