Fixing some of the lists