more sync fixes.