Fixes for CCC