Fix some things in Windows build...