Redirects now working correctly for most types.