AegisHO8 fixes