Additional TB_PREFIX fixes and correction