minor changes to deal with core accessibility changes