Some small fixes
Merge branch 'rohu/smallfixes' into development