small fixes
Merge origin/master