Fix TODO exporting with newer TBs