More fixes to markup