Fixes to CCControl