HPCC-10409 Fix issues picked up in code review

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