redirection fixes