HPCC-12223 Fixes for review

Signed-off-by: Michael Gardner <Michael.Gardner@lexisnexis.com>