HOPKINS: Fix a couple of regressions in previous commit. Thanks fuzzie for noticing