Fix up redirection a bit more.