Some Map adjustments