Various fixes

Signed-off-by: igio90 <giovanni.rocca.90@gmail.com>
Various fixes 2
Signed-off-by: igio90 <giovanni.rocca.90@gmail.com>