Correct a few issues

Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>