Fix list updating issues