Minor code review fixes