WAI 2.0 fixes