More markup improvements