Fix the lists