Correction bugs

Signed-off-by: Nicolas Giannuzzi <contact@nicolasgiannuzzi.com>