Addressing Windows build issues.