small fixes for pull request