Location issues fixed