More code review fixes