small fixes
Merge branch 'hotfix/0.4.5'