Some item-list loop fixes