Fixes for W3C Markup Validation