Partialy applied data migration, other minor changes.