Small fixes
Merge branch 'SmallFixes'