Code review fix.
More fix based on code review.