Last minute fixes for w3c