Map controller fixes