Some changes for Windows