Migrate some existing changes