Minor fixes on T3 interface