Fixed some markup quirks