More fixes for structural meshing to allow T1/T2