Some fixes
Merge branch 'master' into Issue_22