Fixed a couple of Markup issues