Fixes for w3c validations