MMAPS: ConfuseMove fixes