More W3C fixes