Update to latest a11y changes