Fixed list issues