diff --git a/src/system_wrappers/source/cpu_linux.cc b/src/system_wrappers/source/cpu_linux.cc
index eff9704db9..2e095002b1 100644
--- a/src/system_wrappers/source/cpu_linux.cc
+++ b/src/system_wrappers/source/cpu_linux.cc
@@ -153,7 +153,10 @@ int CpuLinux::GetNumCores()
     }
     // Skip first line
     char line[100];
-    char* dummy = fgets(line, 100, fp);
+    if (!fgets(line, 100, fp))
+    {
+        return -1;
+    }
     int numCores = -1;
     char firstWord[100];
     do
diff --git a/src/system_wrappers/source/map.cc b/src/system_wrappers/source/map.cc
index 0bff155be4..331da328b8 100644
--- a/src/system_wrappers/source/map.cc
+++ b/src/system_wrappers/source/map.cc
@@ -13,7 +13,7 @@
 #include "trace.h"
 
 namespace webrtc {
-MapItem::MapItem(int id, void* item) : item_pointer_(item), item_id_(id)
+MapItem::MapItem(int id, void* item) : item_id_(id), item_pointer_(item)
 {
 }