Fixes for map loading