Fixing final URL redirects