Fix a few ARIA related issues.