minor fixes
Merge origin/master