bug fixes
Merge branch 'hotfix/misc'