Fixing bugs for W3C