Make a little bit more Windows friendly