some fixes
Merge branch 'hotfixes' into develop