diff --git a/m/McLachlanW.m b/m/McLachlanW.m
index bc0279a..db1d935 100644
--- a/m/McLachlanW.m
+++ b/m/McLachlanW.m
@@ -1,5 +1,5 @@
-$Path = Join[$Path, {"~/Calpha/Kranc/Tools/CodeGen",
-                     "~/Calpha/Kranc/Tools/MathematicaMisc"}];
+$Path = Join[$Path, {"../../../repos/kranc/Tools/CodeGen",
+                     "../../../repos/kranc/Tools/MathematicaMisc"}];
 
 Get["KrancThorn`"];
 
diff --git a/m/McLachlan_ADM.m b/m/McLachlan_ADM.m
index dac19c3..d274c91 100644
--- a/m/McLachlan_ADM.m
+++ b/m/McLachlan_ADM.m
@@ -1,5 +1,5 @@
-$Path = Join[$Path, {"../../../kranc/Tools/CodeGen",
-                     "../../../kranc/Tools/MathematicaMisc"}];
+$Path = Join[$Path, {"../../../repos/kranc/Tools/CodeGen",
+                     "../../../repos/kranc/Tools/MathematicaMisc"}];
  
 Get["KrancThorn`"];
 
diff --git a/m/McLachlan_ADMConstraints.m b/m/McLachlan_ADMConstraints.m
index ab7d98e..7a4f9f2 100644
--- a/m/McLachlan_ADMConstraints.m
+++ b/m/McLachlan_ADMConstraints.m
@@ -1,5 +1,5 @@
-$Path = Join[$Path, {"../../../kranc/Tools/CodeGen",
-                     "../../../kranc/Tools/MathematicaMisc"}];
+$Path = Join[$Path, {"../../../repos/kranc/Tools/CodeGen",
+                     "../../../repos/kranc/Tools/MathematicaMisc"}];
 
 Get["KrancThorn`"];
 
diff --git a/m/McLachlan_ADMQuantities.m b/m/McLachlan_ADMQuantities.m
index 5891c93..ead1a78 100644
--- a/m/McLachlan_ADMQuantities.m
+++ b/m/McLachlan_ADMQuantities.m
@@ -1,5 +1,5 @@
-$Path = Join[$Path, {"../../../kranc/Tools/CodeGen",
-                     "../../../kranc/Tools/MathematicaMisc"}];
+$Path = Join[$Path, {"../../../repos/kranc/Tools/CodeGen",
+                     "../../../repos/kranc/Tools/MathematicaMisc"}];
 
 Get["KrancThorn`"];
 
diff --git a/m/McLachlan_BSSN.m b/m/McLachlan_BSSN.m
index 19e61d8..884fc4f 100644
--- a/m/McLachlan_BSSN.m
+++ b/m/McLachlan_BSSN.m
@@ -1,5 +1,5 @@
-$Path = Join[$Path, {"../../../kranc/Tools/CodeGen",
-                     "../../../kranc/Tools/MathematicaMisc"}];
+$Path = Join[$Path, {"../../../repos/kranc/Tools/CodeGen",
+                     "../../../repos/kranc/Tools/MathematicaMisc"}];
 
 Get["KrancThorn`"];
 
diff --git a/m/McLachlan_BSSN_Peter.m b/m/McLachlan_BSSN_Peter.m
index d72f5f0..b8404cf 100644
--- a/m/McLachlan_BSSN_Peter.m
+++ b/m/McLachlan_BSSN_Peter.m
@@ -1,5 +1,5 @@
-$Path = Join[$Path, {"~/Calpha/kranc/Tools/CodeGen",
-                     "~/Calpha/kranc/Tools/MathematicaMisc"}];
+$Path = Join[$Path, {"../../../repos/kranc/Tools/CodeGen",
+                     "../../../repos/kranc/Tools/MathematicaMisc"}];
 
 Get["KrancThorn`"];
 
diff --git a/m/McLachlan_WeylScalars.m b/m/McLachlan_WeylScalars.m
index f080478..a88c9ee 100644
--- a/m/McLachlan_WeylScalars.m
+++ b/m/McLachlan_WeylScalars.m
@@ -1,5 +1,5 @@
-$Path = Join[$Path, {"~/Calpha/kranc/Tools/CodeGen",
-                     "~/Calpha/kranc/Tools/MathematicaMisc"}];
+$Path = Join[$Path, {"../../../repos/kranc/Tools/CodeGen",
+                     "../../../repos/kranc/Tools/MathematicaMisc"}];
 
 Get["KrancThorn`"];
 
diff --git a/m/McLachlantmp.m b/m/McLachlantmp.m
index 499597b..48c7de6 100644
--- a/m/McLachlantmp.m
+++ b/m/McLachlantmp.m
@@ -1,5 +1,5 @@
-$Path = Join[$Path, {"~/Calpha/Kranc/Tools/CodeGen",
-                     "~/Calpha/Kranc/Tools/MathematicaMisc"}];
+$Path = Join[$Path, {"../../../repos/kranc/Tools/CodeGen",
+                     "../../../repos/kranc/Tools/MathematicaMisc"}];
 
 Get["KrancThorn`"];
 
diff --git a/m/WaveToy.m b/m/WaveToy.m
index 792f81b..ffd796c 100644
--- a/m/WaveToy.m
+++ b/m/WaveToy.m
@@ -1,5 +1,5 @@
-$Path = Join[$Path, {"../../../kranc/Tools/CodeGen",
-                     "../../../kranc/Tools/MathematicaMisc"}];
+$Path = Join[$Path, {"../../../repos/kranc/Tools/CodeGen",
+                     "../../../repos/kranc/Tools/MathematicaMisc"}];
 
 Get["KrancThorn`"];
 
diff --git a/m/WaveToyFO.m b/m/WaveToyFO.m
index 4bc2bab..b9f608b 100644
--- a/m/WaveToyFO.m
+++ b/m/WaveToyFO.m
@@ -1,5 +1,5 @@
-$Path = Join[$Path, {"../../../kranc/Tools/CodeGen",
-                     "../../../kranc/Tools/MathematicaMisc"}];
+$Path = Join[$Path, {"../../../repos/kranc/Tools/CodeGen",
+                     "../../../repos/kranc/Tools/MathematicaMisc"}];
 
 Get["KrancThorn`"];
 
diff --git a/m/WaveToyMP.m b/m/WaveToyMP.m
index 0b6336d..13c8fdf 100644
--- a/m/WaveToyMP.m
+++ b/m/WaveToyMP.m
@@ -1,5 +1,5 @@
-$Path = Join[$Path, {"../../../kranc/Tools/CodeGen",
-                     "../../../kranc/Tools/MathematicaMisc"}];
+$Path = Join[$Path, {"../../../repos/kranc/Tools/CodeGen",
+                     "../../../repos/kranc/Tools/MathematicaMisc"}];
 
 Get["KrancThorn`"];
 
diff --git a/m/fixup-ADMConstraints.pl b/m/fixup-ADMConstraints.pl
index faf68b6..121b3b9 100755
--- a/m/fixup-ADMConstraints.pl
+++ b/m/fixup-ADMConstraints.pl
@@ -18,10 +18,10 @@ close FILE or die;
 #}
 
 $lines[33] = <<EOF;
-  ierr = Boundary_SelectGroupForBC (cctkGH, CCTK_ALL_FACES, 1, -1, "${thorn}::ML_Ham", "scalar");
+  ierr = Boundary_SelectGroupForBC (cctkGH, CCTK_ALL_FACES, boundary_width, -1, "${thorn}::ML_Ham", "scalar");
   if (ierr<0) CCTK_WARN (CCTK_WARN_ABORT, "Failed to select boundary condition for ${thorn}::ML_Ham");
 
-  ierr = Boundary_SelectGroupForBC (cctkGH, CCTK_ALL_FACES, 1, -1, "${thorn}::ML_mom", "scalar");
+  ierr = Boundary_SelectGroupForBC (cctkGH, CCTK_ALL_FACES, boundary_width, -1, "${thorn}::ML_mom", "scalar");
   if (ierr<0) CCTK_WARN (CCTK_WARN_ABORT, "Failed to select boundary condition for ${thorn}::ML_mom");
 EOF
 
diff --git a/m/fixup-ADMQuantities.pl b/m/fixup-ADMQuantities.pl
index 0cf061a..bd1ffb3 100755
--- a/m/fixup-ADMQuantities.pl
+++ b/m/fixup-ADMQuantities.pl
@@ -18,10 +18,10 @@ close FILE or die;
 #}
 
 $lines[33] = <<EOF;
-  ierr = Boundary_SelectGroupForBC (cctkGH, CCTK_ALL_FACES, 1, -1, "${thorn}::ML_Jadm", "scalar");
+  ierr = Boundary_SelectGroupForBC (cctkGH, CCTK_ALL_FACES, boundary_width, -1, "${thorn}::ML_Jadm", "scalar");
   if (ierr<0) CCTK_WARN (CCTK_WARN_ABORT, "Failed to select boundary condition for ${thorn}::ML_Jadm");
 
-  ierr = Boundary_SelectGroupForBC (cctkGH, CCTK_ALL_FACES, 1, -1, "${thorn}::ML_Madm", "scalar");
+  ierr = Boundary_SelectGroupForBC (cctkGH, CCTK_ALL_FACES, boundary_width, -1, "${thorn}::ML_Madm", "scalar");
   if (ierr<0) CCTK_WARN (CCTK_WARN_ABORT, "Failed to select boundary condition for ${thorn}::ML_Madm");
 EOF
 
diff --git a/m/hydro.m b/m/hydro.m
index 280c3e8..dc99a67 100644
--- a/m/hydro.m
+++ b/m/hydro.m
@@ -1,5 +1,5 @@
-$Path = Join[$Path, {"~/Calpha/kranc/Tools/CodeGen",
-                     "~/Calpha/kranc/Tools/MathematicaMisc"}];
+$Path = Join[$Path, {"../../../repos/kranc/Tools/CodeGen",
+                     "../../../repos/kranc/Tools/MathematicaMisc"}];
 
 Get["KrancThorn`"];