Redirection fixes.
Redirection fixes.