fix compilation and otherlittle things

Change-Id: I2f8efe01599ec9a2057fccb0e2a8c631703b1e41