Some changes for pull request.