Couple of markup fixes