Minor tweaks to the migrate script