HPCC-10230 Fix issues highlighted in code review

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