Some updates.

Signed-off-by: Florent Bruneau <florent.bruneau@intersec.com>