- Some fixes to get it working on windows