more fixes for TChiHH