diff --git a/Makefile b/Makefile
index 1b09c96cdc..0ee181ac6f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 # Let's discover something about where we run
 ifeq "$(SHELL)" "cmd.exe"
-SYSTEM=win
+  SYSTEM=win
 else
-ifeq "$(SHELL)" "sh.exe"
-SYSTEM=win
-else
-SYSTEM=unix
-endif
+  ifeq "$(SHELL)" "sh.exe"
+    SYSTEM=win
+  else
+    SYSTEM=unix
+  endif
 endif
 
 # First, we include predefined variables
diff --git a/Makefile.build.cpp b/Makefile.build.cpp
index 5ea01d7b00..2405f98e19 100644
--- a/Makefile.build.cpp
+++ b/Makefile.build.cpp
@@ -435,4 +435,3 @@ objs/integer_solver_example.$O: examples/integer_solver_example.cc
 
 integer_solver_example$E: $(LP_LIBS) $(BASE_LIBS) objs/integer_solver_example.$O
 	$(CCC) $(CFLAGS) $(LDFLAGS) objs/integer_solver_example.$O $(LP_LIBS) $(BASE_LIBS) $(LDLPDEPS) $(EXEOUT)integer_solver_example$E
-
diff --git a/Makefile.build.python b/Makefile.build.python
index 6f3ada869b..509d43c442 100644
--- a/Makefile.build.python
+++ b/Makefile.build.python
@@ -87,4 +87,3 @@ _pywraplp.$(SHAREDLIBEXT): objs/linear_solver_wrap.$O $(LP_LIBS) $(BASE_LIBS)
 ifeq "$(SYSTEM)" "win"
 	copy _pywraplp.dll gen\\linear_solver\\_pywraplp.pyd
 endif
-
diff --git a/Makefile.def b/Makefile.def
index 47de165e66..c029e21ec2 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -21,12 +21,12 @@ UNIX_GLPK_DIR=../glpk-4.45
 # Linux jdk root
 # first, determine 32 or 64 bits.
 ifeq "$(SYSTEM)" "unix"
-LBITS := $(shell getconf LONG_BIT)
-ifeq ($(LBITS),64)
-   JDK_EXT=64
-else
-   JDK_EXT=32
-endif
+  LBITS := $(shell getconf LONG_BIT)
+  ifeq ($(LBITS),64)
+     JDK_EXT=64
+  else
+    JDK_EXT=32
+  endif
 endif
 
 LINUX_JDK_ROOT=/usr/local/buildtools/java/jdk-$(JDK_EXT)
diff --git a/Makefile.unix b/Makefile.unix
index cd624db409..e89164c575 100644
--- a/Makefile.unix
+++ b/Makefile.unix
@@ -120,4 +120,4 @@ OBJOUT=-o$(SPACE)
 EXEOUT=-o$(SPACE)
 DEL=rm -f
 S=/
-CPSEP=:
\ No newline at end of file
+CPSEP=:
diff --git a/Makefile.win b/Makefile.win
index db5f0c6f05..6d6dba4505 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -71,4 +71,3 @@ S=\\
 CPSEP=;
 DEL=del
 JNILIBEXT=dll
-
diff --git a/graph/bellman_ford.cc b/graph/bellman_ford.cc
index 828b1351f3..0575b2b559 100644
--- a/graph/bellman_ford.cc
+++ b/graph/bellman_ford.cc
@@ -47,7 +47,7 @@ class BellmanFord {
   const int node_count_;
   const int start_node_;
   scoped_ptr<ResultCallback2<int64, int, int> > graph_;
-  const int disconnected_distance_;
+  const int64 disconnected_distance_;
   scoped_array<int64> distance_;
   scoped_array<int> predecessor_;
 };
diff --git a/graph/shortestpaths.cc b/graph/shortestpaths.cc
index fd58ac27d6..1c4494cbaa 100644
--- a/graph/shortestpaths.cc
+++ b/graph/shortestpaths.cc
@@ -17,6 +17,8 @@
 #include "base/callback.h"
 #include "base/commandlineflags.h"
 #include "base/integral_types.h"
+#include "base/logging.h"
+#include "base/macros.h"
 
 DEFINE_int32(shortestpaths_disconnected_distance, 200000,
              "Distance returned when two node are disconnected");