Some HP and 7.6 fixes