Fixing Map Bugs