fix some rt cleanup and failure edge cases

Or put dataSource in the description