Resolved more CC warnings.