Revert "Minor Map Fixes"

This reverts commit ad053bc7b2d0dfa1619a5bd3fc77a25d44d0a92d.