Fixes after W3 Validator