More fixes for sync…