Improved HTML5 compliancy