Small changes for hhnk