misc fixes
Merge branch 'master' into tags-master