Last fixes.

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>