Fixes to ensure HTML5 conformance