Markup small fixes