various fixes
Merge branch 'dev'