diff --git a/ortools/bop/bop_base.cc b/ortools/bop/bop_base.cc
index 16e34db986..ee7d699384 100644
--- a/ortools/bop/bop_base.cc
+++ b/ortools/bop/bop_base.cc
@@ -255,6 +255,5 @@ const std::vector<sat::BinaryClause>& ProblemState::NewlyAddedBinaryClauses()
 void ProblemState::SynchronizationDone() {
   binary_clause_manager_.ClearNewlyAdded();
 }
-
 }  // namespace bop
 }  // namespace operations_research
diff --git a/ortools/bop/bop_base.h b/ortools/bop/bop_base.h
index c7357c751e..988cc4d827 100644
--- a/ortools/bop/bop_base.h
+++ b/ortools/bop/bop_base.h
@@ -282,7 +282,6 @@ struct LearnedInfo {
   // New binary clauses.
   std::vector<sat::BinaryClause> binary_clauses;
 };
-
 }  // namespace bop
 }  // namespace operations_research
 #endif  // OR_TOOLS_BOP_BOP_BASE_H_
diff --git a/ortools/bop/bop_solver.cc b/ortools/bop/bop_solver.cc
index 3b68d77054..a96a2d7fee 100644
--- a/ortools/bop/bop_solver.cc
+++ b/ortools/bop/bop_solver.cc
@@ -62,7 +62,6 @@ bool UpdateProblemStateBasedOnStatus(BopOptimizerBase::Status status,
 
   return false;
 }
-
 }  // anonymous namespace
 
 //------------------------------------------------------------------------------
diff --git a/ortools/flatzinc/cp_model_fz_solver.cc b/ortools/flatzinc/cp_model_fz_solver.cc
index 704b47c247..dd1d76d187 100644
--- a/ortools/flatzinc/cp_model_fz_solver.cc
+++ b/ortools/flatzinc/cp_model_fz_solver.cc
@@ -1215,7 +1215,7 @@ void SolveFzWithCpModelProto(const fz::Model& fz_model,
   // Fill the search order.
   m.TranslateSearchAnnotations(fz_model.search_annotations(), logger);
 
-  if (p.display_all_solutions && !m.proto.has_objective()) {
+  if (p.display_all_solutions && !m.pb.has_objective()) {
     // Enumerate all sat solutions.
     m.parameters.set_enumerate_all_solutions(true);
   }
diff --git a/ortools/gurobi/environment.h b/ortools/gurobi/environment.h
index 430b3e8c65..0384a82ea2 100644
--- a/ortools/gurobi/environment.h
+++ b/ortools/gurobi/environment.h
@@ -724,8 +724,6 @@ extern std::function<char *(void)> GRBplatform;
 #define GRB_BATCH_ABORTED 3
 #define GRB_BATCH_FAILED 4
 #define GRB_BATCH_COMPLETED 5
-
-
 }  // namespace operations_research
 
 #endif  // OR_TOOLS_GUROBI_ENVIRONMENT_H_