Fix some awkward markup