- fixes for ccg