Same mapfix, part 1.
Same mapfix, part 2. Also, minor update.
Merge pull request #3578 from Segrain/dev

Same mapfix. Third time is a charm.