Fixed Some List bugs