more sync fixes