diff --git a/examples/conducting-wall-mode/cwm.cxx b/examples/conducting-wall-mode/cwm.cxx
index 2418b8183d..843a364eb0 100644
--- a/examples/conducting-wall-mode/cwm.cxx
+++ b/examples/conducting-wall-mode/cwm.cxx
@@ -181,7 +181,7 @@ class CWM : public PhysicsModel {
     // Normalise magnetic field
     Bpxy /= (bmag / 1.e4);
     Btxy /= (bmag / 1.e4);
-    coord->Bxy() /= (bmag / 1.e4);
+    coord->setBxy(coord->Bxy() / (bmag / 1.e4));
 
     // Set nu
     nu = nu_hat * Ni0 / pow(Te0, 1.5);
diff --git a/examples/constraints/alfven-wave/alfven.cxx b/examples/constraints/alfven-wave/alfven.cxx
index bd3b54952d..56d70a37b2 100644
--- a/examples/constraints/alfven-wave/alfven.cxx
+++ b/examples/constraints/alfven-wave/alfven.cxx
@@ -183,7 +183,7 @@ class Alfven : public PhysicsModel {
 
     Bpxy /= Bnorm;
     Btxy /= Bnorm;
-    coord->Bxy() /= Bnorm;
+    coord->setBxy(coord->Bxy() / Bnorm);
 
     // Check type of parallel transform
     std::string ptstr =
diff --git a/examples/em-drift/2fluid.cxx b/examples/em-drift/2fluid.cxx
index 3ec54858cd..5061b6c106 100644
--- a/examples/em-drift/2fluid.cxx
+++ b/examples/em-drift/2fluid.cxx
@@ -174,7 +174,7 @@ class EMdrift : public PhysicsModel {
     // Normalise magnetic field
     Bpxy /= (bmag / 1.e4);
     Btxy /= (bmag / 1.e4);
-    coord->Bxy() /= (bmag / 1.e4);
+    coord->setBxy(coord->Bxy() / (bmag / 1.e4));
 
     /**************** CALCULATE METRICS ******************/
 
diff --git a/examples/lapd-drift/lapd_drift.cxx b/examples/lapd-drift/lapd_drift.cxx
index aa8e9284df..3542b1bf76 100644
--- a/examples/lapd-drift/lapd_drift.cxx
+++ b/examples/lapd-drift/lapd_drift.cxx
@@ -324,7 +324,7 @@ class LAPDdrift : public PhysicsModel {
     // Normalise magnetic field
     Bpxy /= (bmag / 1.e4);
     Btxy /= (bmag / 1.e4);
-    coord->Bxy() /= (bmag / 1.e4);
+    coord->setBxy(coord->Bxy() / (bmag / 1.e4));
 
     // calculate pressures
     pei0 = (Ti0 + Te0) * Ni0;
diff --git a/examples/laplacexy/alfven-wave/alfven.cxx b/examples/laplacexy/alfven-wave/alfven.cxx
index 3c95f62e97..b2507b9ee1 100644
--- a/examples/laplacexy/alfven-wave/alfven.cxx
+++ b/examples/laplacexy/alfven-wave/alfven.cxx
@@ -192,7 +192,7 @@ class Alfven : public PhysicsModel {
 
     Bpxy /= Bnorm;
     Btxy /= Bnorm;
-    coord->Bxy() /= Bnorm;
+    coord->setBxy(coord->Bxy() / Bnorm);
 
     // Calculate metric components
     sinty = 0.0; // I disappears from metric for shifted coordinates
diff --git a/examples/reconnect-2field/2field.cxx b/examples/reconnect-2field/2field.cxx
index 2d1c499447..aef6a3eb49 100644
--- a/examples/reconnect-2field/2field.cxx
+++ b/examples/reconnect-2field/2field.cxx
@@ -156,7 +156,7 @@ class TwoField : public PhysicsModel {
     // Normalise magnetic field
     Bpxy /= Bnorm;
     Btxy /= Bnorm;
-    coord->Bxy() /= Bnorm;
+    coord->setBxy(coord->Bxy() / Bnorm);
 
     // Plasma quantities
     Jpar0 /= Nenorm * Charge * Cs;
@@ -273,10 +273,10 @@ class TwoField : public PhysicsModel {
     ddt(U) = SQ(coord->Bxy()) * Grad_parP(jpar / coord_ylow->Bxy(), CELL_CENTRE);
 
     if (include_jpar0) {
-      ddt(U) -=
-          SQ(coord->Bxy()) * beta_hat
-          * interp_to(bracket(Apar + Apar_ext, Jpar0 / coord_ylow->Bxy(), BRACKET_ARAKAWA),
-                      CELL_CENTRE);
+      ddt(U) -= SQ(coord->Bxy()) * beta_hat
+                * interp_to(
+                    bracket(Apar + Apar_ext, Jpar0 / coord_ylow->Bxy(), BRACKET_ARAKAWA),
+                    CELL_CENTRE);
     }
 
     ddt(U) -= bracket(Phi0_ext, U, bm); // ExB advection
diff --git a/examples/shear-alfven-wave/2fluid.cxx b/examples/shear-alfven-wave/2fluid.cxx
index 1506ff7af4..c137a828ca 100644
--- a/examples/shear-alfven-wave/2fluid.cxx
+++ b/examples/shear-alfven-wave/2fluid.cxx
@@ -174,7 +174,7 @@ class ShearAlfven : public PhysicsModel {
     // Normalise magnetic field
     Bpxy /= (bmag / 1.e4);
     Btxy /= (bmag / 1.e4);
-    coord->Bxy() /= (bmag / 1.e4);
+    coord->setBxy(coord->Bxy() / (bmag / 1.e4));
 
     // calculate pressures
     pei0 = (Ti0 + Te0) * Ni0;
diff --git a/examples/tokamak-2fluid/2fluid.cxx b/examples/tokamak-2fluid/2fluid.cxx
index 5739281882..cba1238f24 100644
--- a/examples/tokamak-2fluid/2fluid.cxx
+++ b/examples/tokamak-2fluid/2fluid.cxx
@@ -372,7 +372,7 @@ class TwoFluid : public PhysicsModel {
     // Normalise magnetic field
     Bpxy /= (bmag / 1.e4);
     Btxy /= (bmag / 1.e4);
-    coord->Bxy() /= (bmag / 1.e4);
+    coord->setBxy(coord->Bxy() / (bmag / 1.e4));
 
     // calculate pressures
     pei0 = (Ti0 + Te0) * Ni0;
diff --git a/tests/integrated/test-drift-instability/2fluid.cxx b/tests/integrated/test-drift-instability/2fluid.cxx
index 687f55f37a..3e38eff4be 100644
--- a/tests/integrated/test-drift-instability/2fluid.cxx
+++ b/tests/integrated/test-drift-instability/2fluid.cxx
@@ -209,7 +209,7 @@ class TwoFluid : public PhysicsModel {
     // Normalise magnetic field
     Bpxy /= (bmag / 1.e4);
     Btxy /= (bmag / 1.e4);
-    coord->Bxy() /= (bmag / 1.e4);
+    coord->setBxy(coord->Bxy() / (bmag / 1.e4));
 
     // calculate pressures
     pei0 = (Ti0 + Te0) * Ni0;
diff --git a/tests/integrated/test-interchange-instability/2fluid.cxx b/tests/integrated/test-interchange-instability/2fluid.cxx
index 34496f8825..9f0755f2eb 100644
--- a/tests/integrated/test-interchange-instability/2fluid.cxx
+++ b/tests/integrated/test-interchange-instability/2fluid.cxx
@@ -135,7 +135,7 @@ class Interchange : public PhysicsModel {
     // Normalise magnetic field
     Bpxy /= (bmag / 1.e4);
     Btxy /= (bmag / 1.e4);
-    coord->Bxy() /= (bmag / 1.e4);
+    coord->setBxy(coord->Bxy() / (bmag / 1.e4));
 
     /**************** CALCULATE METRICS ******************/
 
@@ -146,8 +146,7 @@ class Interchange : public PhysicsModel {
     g12 = 0.0;
     g13 = -I * coord->g11();
     g23 = -Btxy / (hthe * Bpxy * Rxy);
-    coord->setContravariantMetricTensor(
-        MetricTensor(g11, g22, g33, g12, g13, g23));
+    coord->setContravariantMetricTensor(MetricTensor(g11, g22, g33, g12, g13, g23));
 
     coord->setJ(hthe / Bpxy);
 
@@ -158,8 +157,7 @@ class Interchange : public PhysicsModel {
     g_12 = Btxy * hthe * I * Rxy / Bpxy;
     g_13 = I * Rxy * Rxy;
     g_23 = Btxy * hthe * Rxy / Bpxy;
-    coord->setCovariantMetricTensor(
-        MetricTensor(g_11, g_22, g_33, g_12, g_13, g_23));
+    coord->setCovariantMetricTensor(MetricTensor(g_11, g_22, g_33, g_12, g_13, g_23));
 
     coord->geometry();