improved handling of initial syncs