More changes from the migration guide