Mapfixes - Hopefully

Signed-off-by: Jamini <mobiousjami@gmail.com>
Merge pull request #2828 from Jamini/master

More mapfixes.