Address T1/T2 issues