Minor TS changes