Fix Locations