Seblu: Fix too many things...

Signed-off-by: Seblu <sebastien.luttringer@smartjog.com>