Few little fixes from code review.