various sync fixes