Fixed issues re. w3c