Fixes to run on windows