Fixed various inconsistencies between T3D and T2D