Map fixes by @pitis91
Merge pull request #758 from EPuncker/master

Map fixes by @pitis91