First batch of changes from migration guide