Improve the redirects