Late modifications. Hope i'm not gonna break anything

Signed-off-by: Balthazar Rouberol <balthazar.rouberol@mapado.com>