More linked list fixes