diff --git a/chrome_proxy_resolver.cc b/chrome_proxy_resolver.cc
index 7d3676b..37ccd8c 100644
--- a/chrome_proxy_resolver.cc
+++ b/chrome_proxy_resolver.cc
@@ -78,7 +78,10 @@
 DBusGProxy* ChromeProxyResolver::DbusProxy() {
   GError* error = NULL;
   DBusGConnection* bus = dbus_->BusGet(DBUS_BUS_SYSTEM, &error);
-  TEST_AND_RETURN_FALSE(bus);
+  if (!bus) {
+    LOG(ERROR) << "Failed to get System Dbus";
+    return NULL;
+  }
   DBusGProxy* proxy = dbus_->ProxyNewForNameOwner(bus,
                                                   kSessionManagerService,
                                                   kSessionManagerPath,
diff --git a/delta_diff_generator.cc b/delta_diff_generator.cc
index f00ac7f..d4ebc4e 100644
--- a/delta_diff_generator.cc
+++ b/delta_diff_generator.cc
@@ -1425,7 +1425,7 @@
   TEST_AND_RETURN_FALSE(utils::MakeTempFile(
       "/tmp/CrAU_temp_data.ordered.XXXXXX",
       &ordered_blobs_path,
-      false));
+      NULL));
   TEST_AND_RETURN_FALSE(ReorderDataBlobs(&manifest,
                                          temp_file_path,
                                          ordered_blobs_path));
diff --git a/update_attempter_unittest.cc b/update_attempter_unittest.cc
index a516695..8b7be1a 100644
--- a/update_attempter_unittest.cc
+++ b/update_attempter_unittest.cc
@@ -330,7 +330,7 @@
 TEST_F(UpdateAttempterTest, PingOmahaTest) {
   UpdateCheckScheduler scheduler(&attempter_);
   scheduler.enabled_ = true;
-  EXPECT_EQ(false, scheduler.scheduled_);
+  EXPECT_FALSE(scheduler.scheduled_);
   attempter_.set_update_check_scheduler(&scheduler);
   loop_ = g_main_loop_new(g_main_context_default(), FALSE);
   g_idle_add(&StaticPingOmahaTestStart, this);