Fixes of reviewers comments.