Fix a few more potential file sync errors