ccn: minor fixes

Some minor cleanups.