Fixed move functions.