WC3 Validation errors fixes