Fixed some issues on W3C