More explicit syncing, and sync the directories too. This attempts to avoid more...