Fixing external redirects