Fix compilation issues

Change-Id: Ife2721d6e2a844fb9176537a4e61a6ed16455fd3