Made fixes for locations
Made fixes for locations