More time sync fixes