MASTER - Mapfixes.

Same fixes as on BEF. These are atmos/bugfixes and should be merged.

Signed-off-by: Jamini <mobiousjami@gmail.com>