Changes for shipping Windows version