Various additional WAI 3.0 fixes