Minor fixes the Windows compiler demanded

Change-Id: I9735483db2470104ee2ad4f4276d2a924f08fc69
Merge branch 'windows-fixes'

Change-Id: I031ff6072fd36a2418e466101d11ce7ceb3adb4d