HOPKINS: Fix regressions in d6f72071a42559299139fd2f162c98c7f01a0b51