Minor improvements for moving files