Fixed Windows isses