dagmc and data source fixes