fixes

Signed-off-by: sylafrs <sylaf@hotmail.fr>
Merge branch 'master' into fguilleminot