Fix a couple issues in locations