CH1: various fixes