cpr small fixes