Fixed move inconsistencies