Model fixes after location change #2