fix compiler warnings

Change-Id: I010b08a333357d32985bb09ea5bbdcf0e29f0f05