Some W3C Validation fixes