Fix some list issues again