Improve H02 decoders