Few More Map Fixes