Clean out more MSVC warnings

Change-Id: I1bab0c104df2ec4825d050cd516e26ab635a7b3e
5 files changed