Small fixes
Merge branch 'master' into tests