Minor markup improvements