More map tweaks