Small markup improvements