HPCC-10176 Minor fix, etc

Signed-off-by: Kevin Wang <kevin.wang@lexisnexis.com>