Adaptations to latest HSTH update