more tweaks to migration