Fixed some w3c stuff