Fixing build for Windows