CR Fixes, part2