Export - Map tweaks