Further minor sync changes