Further fixes to redirects