Lots of fixes for info.list fiddling