Fixing some redirection issues.