Petter's MSVC fixes

Change-Id: I13a2f6e1046136ce240c22dadd1b7547f56d4493
2 files changed