Merge pull request #3402 from Segrain/master

Mapfixes.
Fix for #3406.
Fix for #3383. Again.