Fix issues with touchz and mv

Change-Id: I512f25988b14e2837dcb3f7ee014929dee8185f0