Fix some win/nix peculiarities