Slightly improve the db migration 534