Fixes for W3C HTML Validation