Small fixes for consistency
Merge branch 'master' into gh-pages