Clean up invalid markup
Merge branch 'oja-invalid-markup'