Domain redirection fixes