#126 minor changes to run in Win