contents: Correct content errors
Merge branch 'maintenance'