Minor Fixes in TB