more move fixes