Final fixes to list