Quick Fix on some stuff.

Signed-off-by: Paolo Maresca <plo.maresca@gmail.com>