Small Map Fixes