small datamigration fixes