diff --git a/.gitmodules b/.gitmodules
index 38b95de5..9da5f576 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "coloquinte"]
 	path = coloquinte
 	url = git@github.com:Coloquinte/PlaceRoute.git
+	branch = coriolis-submodule
diff --git a/etesian/src/EtesianEngine.cpp b/etesian/src/EtesianEngine.cpp
index 491ccf47..66bafeb6 100644
--- a/etesian/src/EtesianEngine.cpp
+++ b/etesian/src/EtesianEngine.cpp
@@ -763,10 +763,11 @@ namespace Etesian {
       if (instance->getPlacementStatus() == Instance::PlacementStatus::FIXED) {
         ++fixedNb;
         totalLength -= length;
-      } else if (instance->getPlacementStatus() == Instance::PlacementStatus::PLACED) {
-        cerr << "PLACED " << instance << endl;
       } else {
         usedLength += length;
+        if (instance->getPlacementStatus() == Instance::PlacementStatus::PLACED) {
+          cerr << "PLACED " << instance << endl;
+        }
       }
     }
     if (instancesNb <= fixedNb) {
@@ -842,7 +843,8 @@ namespace Etesian {
       }
     }
 
-    double spaceMargin = getSpaceMargin();
+    // Compute the space margin from the row length computed earlier
+    double spaceMargin = (double) (totalLength - usedLength) / usedLength;
     double densityVariation = getDensityVariation();
     double bloatFactor = 1.0 +  std::max(spaceMargin - densityVariation, 0.0);
     if (bloatFactor != 1.0) {