Fixed Windows support (probably)