continuation of sync fixes