Fix compilation issues

Change-Id: I36a4477cd4488858912cb61939c240d0f896aab7