HTML validation fixes
Merge