accordian fixes from 4.4