Fixing CCA parallel execution bug and code polishing