Adapt SQL dump for new IDs #2635