Further work on the sync fixes