small fixes
Merge branch 'fix'