HPCC-11693 More changes, spotted during review

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>