Minor map tweaks