CR fixes part 2
CR fixes part 3