Minor changes before pull request