fix DSO issues