TS integration and fire full fix