HPCC-11460 Fix regressions in windows build

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>