Small changes to work in Windows