Model fixes after location change #1