* More fixes to the lists