Giovanni corrections for 3.2