more map rotation fixes