Minor TT improvements