Bug fixes related to move validation