Fixes to how CCs are displayed/recalled...