Minor changes to make it run on windows.