tb.h: box related adaptation fixes