Review fixes 2