Fix minor issues
Merge pull request #1138 from nlegoff/fix-38issue

[3.8.6] minor issues