Last changes to support (again) windows installation.