Fix handling of some lists