Made fixes for locations