Fix couple of trivial warnings reported by MSVC

Change-Id: I971ead9d6280aa16b7dc4c8970c7ba48e3d1ba30
5 files changed