fixes to make t0350x work correctly