More fixes for instant-win maps.