Fixed Windows support for latest changes