Fixed warnings in both CC and EC