A few minor fixes
Merge branch 'master' into build