compilation issues

Change-Id: Ic616818b0a34aa850650b8124d3e5713a6e0cdfa