Wave accesibility fixes