TSB fixes 2