Small changes for Windows build