Fixed a few compiler warnings (MSVC)

Change-Id: I5f04b0243d1b581b805420d762792a875e02f0b7
Merge topic 'compiler-warnings' into master

ed153b16 Fixed a few compiler warnings (MSVC)