Datafile migration part 3

A couple of fixes to the migration command + Grischa's suggested fix for the new REQUIRE_* config parameters