Html fixes.
Merge pull request #1100 from phaidon/html5-fixes

Several Html fixes.