improve handling of situations after autosync