bug fixes due breaking changes in WAI 3.0._._