WINDOWS: Changes for beta2