Fixing parts of the map controller