Corrections so that it will work on windows.