Fix code review issues.