Fix bugs in the list