HPCC-11460 Fix regressions in windows build

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Merge pull request #5902 from ghalliday/issue11460

HPCC-11460 Fix regressions in windows build

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>