Small design changes - fix after gem upgrade of TB