[autogen] More fixes.
[autogen] More fixes.

tstack/lnav,sureshsundriyal/lnav,sureshsundriyal/lnav,acleasby/lnav,tstack/lnav,tstack/lnav,tstack/lnav,acleasby/lnav,acleasby/lnav,acleasby/lnav,sureshsundriyal/lnav,sureshsundriyal/lnav,acleasby/lnav