Some more fixes for w3c