Fixes #7277, map adjustments

Fixes #7277, and includes some map changes and fixes from PR #7249.