Fix some W3c bugs