CH2: misc fixes