Repaired build under windows