TCL error: Can't call after responding - ERR_NOT_SUPPORTED invoked from within

Recently upgraded an old pair of F5s to 16.1 and this started popping. I tried whats in K21541017 but still having issues.

 TCL error: /Common/No_Origin_Redirects <HTTP_REQUEST> - Can't call after responding - ERR_NOT_SUPPORTED (line 1)     invoked from within "HTTP::uri"

Original iRule
when HTTP_REQUEST {
  if { [HTTP::uri] starts_with "origin-www" } {
     #Do nothing
  } elseif { [HTTP::uri] starts_with "www" } {
     pool main_pool
    }
}

TCL error: /Common/X_forward <HTTP_REQUEST> - Can't call after responding - ERR_NOT_SUPPORTED (line 1)     invoked from within "HTTP::header insert X-Forwarded-For [IP::remote_addr]"

Original iRule
when HTTP_REQUEST {
HTTP::header insert X-Forwarded-For [IP::remote_addr]
}

TIA