diff --git a/himbaechel/uarch/gatemate/gatemate.cc b/himbaechel/uarch/gatemate/gatemate.cc
index 9deffeec..4a206c55 100644
--- a/himbaechel/uarch/gatemate/gatemate.cc
+++ b/himbaechel/uarch/gatemate/gatemate.cc
@@ -261,6 +261,10 @@ void GateMateImpl::postPlace()
                 cell.second->params[id_INIT_L01] = Property(int_or_default(upper->params, id_INIT_L01, 0), 4);
             if (upper->params.count(id_INIT_L10))
                 cell.second->params[id_INIT_L10] = Property(int_or_default(upper->params, id_INIT_L10, 0), 4);
+            if (upper->params.count(id_C_I1))
+                cell.second->params[id_C_I1] = Property(int_or_default(upper->params, id_C_I1, 0), 1);
+            if (upper->params.count(id_C_I2))
+                cell.second->params[id_C_I2] = Property(int_or_default(upper->params, id_C_I2, 0), 1);
             upper->movePortTo(id_IN1, cell.second.get(), id_IN1);
             upper->movePortTo(id_IN2, cell.second.get(), id_IN2);
             upper->movePortTo(id_IN3, cell.second.get(), id_IN3);
diff --git a/himbaechel/uarch/gatemate/pack_mult.cc b/himbaechel/uarch/gatemate/pack_mult.cc
index 22bdb7b2..10ca544d 100644
--- a/himbaechel/uarch/gatemate/pack_mult.cc
+++ b/himbaechel/uarch/gatemate/pack_mult.cc
@@ -282,7 +282,7 @@ MultfabCell::MultfabCell(CellInfo *lower, CellInfo *upper, CellInfo *comp, CellI
 
     upper->params[id_C_I1] = Property(1, 1); // PINY1 for L00
     upper->params[id_C_I2] = Property(1, 1); // CINX for L01
-    upper->params[id_C_I3] = Property(1, 1); // PINY1 for L02
+    lower->params[id_C_I3] = Property(1, 1); // PINY1 for L02
     upper->params[id_C_FUNCTION] = Property(C_ADDCIN, 3);
 
     cplines->params[id_C_SELX] = Property(1, 1);  // inverted CINY2 -> CX_VAL
@@ -345,8 +345,8 @@ MultCell::MultCell(CellInfo *lower, CellInfo *upper, CellInfo *cplines, IdString
 
     upper->params[id_C_I1] = Property(1, 1); // PINY1 for L00
     upper->params[id_C_I2] = Property(1, 1); // CINX for L01
-    upper->params[id_C_I3] = Property(1, 1); // PINY1 for L02
-    upper->params[id_C_I4] = Property(1, 1); // PINX for L03
+    lower->params[id_C_I3] = Property(1, 1); // PINY1 for L02
+    lower->params[id_C_I4] = Property(1, 1); // PINX for L03
     upper->params[id_C_FUNCTION] = Property(C_MULT, 3);
 
     if (is_msb) {