Fix W3C compliancy