Code review fixes 2