Fix some stuff with map loaders