More TBUtils improvements.