HPCC-10456 Fix a couple of issues from code review

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