Other minor changes in migration 0171