Fix more HH7 issues