HPCC-11060 - Changes following review

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