Random list fixes