Map minor tweaks