Minor Map Fixes