Tweaks to get things working on windows