Even more fixes for blog
Fix
Merge branch 'develop' into staging