Fix up accordian problems