Last couple of data migration changes.