Fixing several things for the windows installation