Make minor changes to migrate

These changes should not affect migration at all.
I think we can leave this unless an Opera 12 user hits a bug relating to this.