More tweaks to migration script.