Markup validation changes