Update restored H8 support following other changes
3 files changed