Fix list issues