Windows changes

Windows changes