TS fixes and work