Fixed some problems with the map