Fixups for model movement