Fixed some mvs12 bugs.