W3C Validation fixes