fix compilation warnings

Change-Id: Ie5d8bec67c13735227c7895df3c525cd485ce740