Fix W3C issues

God damn it!
Merge pull request #1 from tobbi/w3c-fixes

Fix W3C issues