dl: more cleanup fixes