Small corrections
Address comments of pull request