Is this related to adding Windows support?