locations fixes

locations fixes