Couple of minor improvements
Couple of minor improvements

NicolasSchnitzler/medInria-public,rdebroiz/medInria-public,rdebroiz/medInria-public,NicolasSchnitzler/medInria-public,rdebroiz/medInria-public,NicolasSchnitzler/medInria-public,aabadie/medInria-public,aabadie/medInria-public,aabadie/medInria-public