- Minor fixes/improvements to phi move handling