CR round 1 fixes