Overlay and final map tweaks