map setting fixes