Various open ended accessibility fixes