(refactoring) Fix errors with move under Windows