Updates for switch to windows.