minor hotfixes
Merge branch 'devel'