fix some more problems with syncing