some fixes

Signed-off-by: Rémi Parain <rparain@ubidreams.com>