Fix for #3344.
Fix for #3381.
Quickfix for fix.
Merge pull request #3390 from Segrain/master

Map fixes.