CR related fixes