First round of code review fixes.