TS-2624: Fix Build on older platforms