sync fixes