Apply corrections from Fabrice.