Fixing code review issues.