Wave accessibility fixes