Fixes for map loader