Fixed bugs found on W3C