Some fixes.
Merge branch 'develop' into staging