small fixes
Merge branch 'hotfix/v1'