Updates to allow sync-as-you-go.