Minor tweaks in support of definition library improvements in reporting