fixes for building windows

Change-Id: Ib309a701d984c257d0dd80fa58bf1aa238a4431f