Fix 3.7 and Windows problems

Change-Id: Iec9544a055a1a2e3e2a87b8dce8360ffa64a67c3
2 files changed