Migrate a few more fields