Fix remianing DList issues