Addressing Build Issues for Windows