Fix up some markup