Map changes for #1292
Minor fixes
Merge pull request #1300 from EPuncker/master

Map changes for #1292
Fix #1301