Some changes for Windows environment