routines in upftools needed a fix after I broke them with the last merge