Changes required to make list access actions work again.