Some cleanup on Win side that MAY help Linux side

Change-Id: I0f9930ca8d7a2ff5ec47e519567994a21632e535