Fix issues with moving and renaming across short paths