fixes for cc refactoring