Fix some of the content markup