More CC handling changes