Cosmetic and minor fixes

Signed-off-by: sebhz <seb@zyglute.fr>