Small fixes
Merge branch 'develop' into staging