Fix two msvc build issues

Change-Id: Iece22223773dd6d0f87f8f59827705acd2ebe2a4
2 files changed