Fix up lists