Fix list and other issues