Couple of sync fixes

See commit details