47 migrate d2d fixes

Tested w/ some migration work and some chosen tests.  All seems fine. Will wait 24hrs before merge