TS oneshot build updates