Redirection tweaks