Fixed some Location Resolver issues