Syntax fixes and interface update in TB.