Fixed Windows stuff