Improvement. Minor fixes

Signed-off-by: David Goulet <dgoulet@ev0ke.net>