A couple of minor changs for TBS