Minor fixes
Merge origin/master