more w3c fixes