Fixes for Windows
v1.9.2