2nd code review fixes