Fix warnings from visual c compiler

Change-Id: I9919df4b0989599a9e2f7f0c5206d5db00b861c6