Fixed Windows issues