Few sync fixes.