Fixed some issues with map loading