Remove a few compiler warnings

Change-Id: I72ad2653c1eedd646e21abbc1b3ecb2654ab6b66
2 files changed