Redirect fixes