more code review fixes