Fix lists related bugs