More file move fixes