Small code review fixes