TT adapter fixes