fix some retries