small fixes before pull request