diff --git a/src/system_wrappers/source/event_win.cc b/src/system_wrappers/source/event_win.cc
index 4a6dc9de2..efcb5af87 100644
--- a/src/system_wrappers/source/event_win.cc
+++ b/src/system_wrappers/source/event_win.cc
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
@@ -30,12 +30,12 @@ EventWindows::~EventWindows()
 bool EventWindows::Set()
 {
     // Note: setting an event that is already set has no effect.
-    return SetEvent(_event);
+    return SetEvent(_event) == 1 ? true : false;
 }
 
 bool EventWindows::Reset()
 {
-    return ResetEvent(_event);
+    return ResetEvent(_event) == 1 ? true : false;
 }
 
 EventTypeWrapper EventWindows::Wait(unsigned long maxTime)
diff --git a/test/testsupport/fileutils_unittest.cc b/test/testsupport/fileutils_unittest.cc
index a500a0774..1b76b3cae 100644
--- a/test/testsupport/fileutils_unittest.cc
+++ b/test/testsupport/fileutils_unittest.cc
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
@@ -17,6 +17,7 @@
 #include "gtest/gtest.h"
 
 #ifdef WIN32
+#define chdir _chdir
 static const char* kPathDelimiter = "\\";
 #else
 static const char* kPathDelimiter = "/";