Fix build errors

Change-Id: I8c02a3d85cc5477d57e88a335edf3b5b53bbfdd9
Fix and ready for 4.3
Signed-off-by: iGio90 <giovanni.rocca.90@gmail.com>