small fixes
Merge pull request #1091 from TMMeilleur/1.6

// small fixes