Map Fixes!

Fixes issue #3902