Small fixes to ch2 and ch3