CR related fixes and some fixes due to manual tests.