More cartography tweaks