Fixes for Windows install