Fixed some mv bugs