Some WC3 validation fixes