Fix 3 CPD violations