Fixed Windows related issues.