Last changes before the workshop.