Fix a couple of markup problems