Finish the map fixes

Replace didn’t find all instances!