Fixes

Hi Benjamin,
this time there are only 2 fixes...
Remi