Misc sync fixes.