Initial changes for Windows