Redirect fixes for issues found via analytics