Fixed Windows problems