More fixes to CR