Worked out Windows changes with Linux build