Fix minor problems found in review of merge of NBIA 6.1 into the TCIA master branch.