More accordion fixes