Fix on T3 interface and minor fixes on T4