Fixes for WAI 2.1