Fixes
Merge branch 'magazine'