Minor updates to the map and AssetLoader