Fixes related to separation of DH and DHX types