Fix several MSVC compiler warning/errors

Change-Id: Iccaacee9b7a66b016b5747a3902c236888ad4ba1
2 files changed