More sync fixes.