Bug fixes on accessible