Tweaks based on testing on Windows