Put in fixes for listIterator calls