Minor fixes to list setup