Fix warnings in CPR classes