Fixes found during BUD winter 2025

Well, I didn't spot this as part of a BUD, but still. Discovered these issues with init of some addons after HED had been (re)deployed, will include fix in remaining deployments and leave this MR open in case we find something else.