Some markup refinements