Fixing CEP build