Small fixes
Merge branch 'small-fixes' into develop