Fixed a couple issues where Locations were not properly loading at startup