Static code review fixes.