Minor code review fixes.