More cr fixes