Fix some code review issues.