Fix retries/redirects