HPCC-12351 Updates following review

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