More w3c fixes