Address issue with server resynchronizations.