Fixed issues pointed out by the reviewers.