a few more code review fixes