CRP fixes