Last round of changes from migration guide