(thanks to Lorenzo for spotting some of them once again)

Signed-off-by: Nicola Vigano <nicola.vigano@esrf.fr>