small fixes to CCG