NOJIRA CHHE fixes