diff --git a/makefiles/Makefile.java.mk b/makefiles/Makefile.java.mk
index c75c5f1f28..06f3ec77cf 100644
--- a/makefiles/Makefile.java.mk
+++ b/makefiles/Makefile.java.mk
@@ -62,7 +62,7 @@ $(GEN_DIR)/com/google/ortools/constraintsolver/RoutingParameters.java: $(SRC_DIR
 $(GEN_DIR)/com/google/ortools/constraintsolver/RoutingEnums.java: $(SRC_DIR)/constraint_solver/routing_enums.proto
 	$(PROTOBUF_DIR)/bin/protoc --proto_path=$(SRC_DIR) --java_out=$(GEN_DIR) $(SRC_DIR)$Sconstraint_solver$Srouting_enums.proto
 
-$(LIB_DIR)/protobuf.jar: dependencies$Sinstall$Slib$Sprotobuf.jar
+$(LIB_DIR)/protobuf.jar: dependencies/install/lib/protobuf.jar
 	$(COPY) dependencies$Sinstall$Slib$Sprotobuf.jar $(LIB_DIR)
 
 $(LIB_DIR)/com.google.ortools.jar: \
diff --git a/makefiles/Makefile.port b/makefiles/Makefile.port
index 5a803322cd..95d2e81317 100644
--- a/makefiles/Makefile.port
+++ b/makefiles/Makefile.port
@@ -104,6 +104,7 @@ ifeq ("$(SYSTEM)","win")
     NETPLATFORM = x64
     PORT = VisualStudio$(VISUAL_STUDIO)-64b
     PTRLENGTH = 64
+    ARCH = /DARCH_K8
   else
     PLATFORM = WIN32
     ifeq ("$(VisualStudioVersion)", "14.0")
diff --git a/makefiles/Makefile.third_party.win b/makefiles/Makefile.third_party.win
index ee0a6264c3..87f4bae727 100644
--- a/makefiles/Makefile.third_party.win
+++ b/makefiles/Makefile.third_party.win
@@ -432,9 +432,9 @@ install_java_protobuf: dependencies/install/lib/protobuf.jar
 
 dependencies/install/lib/protobuf.jar: dependencies/install/bin/protoc.exe
 	cd dependencies\\sources\\protobuf-$(PROTOBUF_TAG)\\java && \
-	  ..\\..\\..\\install\\bin\\protoc --java_out=src\\main\\java -I..\\src \
-	  ..\\src\\google\\protobuf\\descriptor.proto
-	cd dependencies\\sources\\protobuf-$(PROTOBUF_TAG)\\java\\src\\main\\java && $(JAR_BIN) cvf ..\\..\\..\\..\\..\\..\\install\\lib\\protobuf.jar com\\google\\protobuf\\*java
+	  ..\\..\\..\\install\\bin\\protoc --java_out=core/src/main/java -I../src \
+	  ../src/google/protobuf/descriptor.proto
+	cd dependencies\\sources\\protobuf-$(PROTOBUF_TAG)\\java\\core\\src\\main\\java && $(JAR_BIN) cvf ..\\..\\..\\..\\..\\..\\..\\install\\lib\\protobuf.jar com\\google\\protobuf\\*java
 
 # Install C# protobuf
 
diff --git a/makefiles/Makefile.win b/makefiles/Makefile.win
index e0fe36dea7..9a342dbd98 100644
--- a/makefiles/Makefile.win
+++ b/makefiles/Makefile.win
@@ -42,7 +42,11 @@ CMAKE = cmake
 
 # Compilation macros.
 DEBUG=/O2 -DNDEBUG
+ifeq ("$(VISUAL_STUDIO)","2015")
+CCC=cl /EHsc /MD /nologo /D_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS
+else
 CCC=cl /EHsc /MD /nologo
+endif
 CSC=csc
 
 GFLAGS_INC = /I$(WINDOWS_GFLAGS_DIR)\\include /DGFLAGS_DLL_DECL= /DGFLAGS_DLL_DECLARE_FLAG= /DGFLAGS_DLL_DEFINE_FLAG=
@@ -120,7 +124,7 @@ JAR_BIN="$(WINDOWS_JDK_DIR)/bin/jar"
 CFLAGS= -nologo $(SYSCFLAGS) $(DEBUG) /I$(INC_DIR) /I$(EX_DIR) /I$(GEN_DIR) \
         $(GFLAGS_INC) $(ZLIB_INC) $(MINISAT_INC) $(PROTOBUF_INC) $(CBC_INC) \
         $(CLP_INC) $(GLPK_INC) $(SCIP_INC) $(SLM_INC) $(GUROBI_INC) /DUSE_GLOP /DUSE_BOP \
-        /D__WIN32__  $(SPARSEHASH_INC) /DPSAPI_VERSION=1
+        /D__WIN32__  $(SPARSEHASH_INC) /DPSAPI_VERSION=1 $(ARCH)
 JNIFLAGS=$(CFLAGS) $(JAVA_INC)
 DYNAMIC_GFLAGS_LNK = $(WINDOWS_GFLAGS_DIR)\\lib\\gflags.lib
 STATIC_GFLAGS_LNK = $(WINDOWS_GFLAGS_DIR)\\lib\\gflags.lib