Minor changes for Windows support