Fix list bugs