More TT improvements