Fixed Windows stuffs