Make minor changes to migrate

These changes should not affect migration at all.