Some adjustments to work in Windows