Fixed some bugs on lists