some redirection fixes