HPCC-8551 Fix some minor issues picked up by code review

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