Minor Fixes

Signed-off-by: MPiunti <m.piunti@reply.it>