More sync fixes