More logic tweaks supporting UPS dim weight on ground service