Fixed Windows build issues due to recent changes.