Follow-ups to https://sbforge.org/fisheye/cru/CR-DOMS-79 and some updates to reflect latest changes to the code.