Fix compilation warnings

Change-Id: I74b2efe43d0cf756eb546a702ab56695047adaf9