Fixes to file move