Trivial Windows changes

Making sure everything runs as expected on Windows.