Last corrections for final version