Quick and dirty fix for some more migration tool dependency issues.