Changes to make working under windows