diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
index 2f5598f2dd..a4433a14e0 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C
@@ -345,13 +345,13 @@ Foam::cyclicAMIFvPatchField<Type>::getNeighbourField
 template<class Type>
 bool Foam::cyclicAMIFvPatchField<Type>::cacheNeighbourField() const
 {
-    const auto& AMI = this->ownerAMI();
+    // const auto& AMI = this->ownerAMI();
 
-    if (AMI.cacheActive())
-    {
-        return false;
-    }
-    else
+    // if (AMI.cacheActive())
+    // {
+    //     return false;
+    // }
+    // else
     {
         return (FieldBase::localBoundaryConsistency() != 0);
     }
@@ -383,11 +383,12 @@ Foam::cyclicAMIFvPatchField<Type>::getPatchNeighbourField
         }
 
         const auto& fvp = this->patch();
+        const auto& mesh = fvp.boundaryMesh().mesh();
 
         if
         (
             patchNeighbourFieldPtr_
-        && !fvp.boundaryMesh().mesh().upToDatePoints(this->internalField())
+        && !mesh.upToDatePoints(this->internalField())
         )
         {
             //DebugPout
@@ -451,7 +452,8 @@ template<class Type>
 Foam::tmp<Foam::Field<Type>>
 Foam::cyclicAMIFvPatchField<Type>::patchNeighbourField() const
 {
-    return this->getPatchNeighbourField(true);  // checkCommunicator = true
+    // checkCommunicator = true
+    return this->getPatchNeighbourField(true);
 }
 
 
diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicACMIGAMGInterfaceField/cyclicACMIGAMGInterfaceField.C b/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicACMIGAMGInterfaceField/cyclicACMIGAMGInterfaceField.C
index 4f0a50270a..576c1485d6 100644
--- a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicACMIGAMGInterfaceField/cyclicACMIGAMGInterfaceField.C
+++ b/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicACMIGAMGInterfaceField/cyclicACMIGAMGInterfaceField.C
@@ -440,18 +440,19 @@ void Foam::cyclicACMIGAMGInterfaceField::updateInterfaceMatrix
 
         if (cache.index0() == -1 && cache.index1() == -1)
         {
-            if (cyclicACMIInterface_.owner())
-            {
-                work = AMI.interpolateToSource(work);
-            }
-            else
-            {
-                work = AMI.interpolateToTarget(work);
-            }
+            solveScalarField pnf(faceCells.size(), Zero);
+
+            AMI.weightedSum
+            (
+                cyclicACMIInterface_.owner(),
+                work,
+                pnf,                // result
+                solveScalarField::null()
+            );
 
             const labelUList& faceCells = lduAddr.patchAddr(patchId);
 
-            this->addToInternalField(result, !add, faceCells, coeffs, work);
+            this->addToInternalField(result, !add, faceCells, coeffs, pnf);
         }
         else
         {
diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.C b/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.C
index 83c7e92246..2cc4d24767 100644
--- a/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.C
+++ b/src/meshTools/AMIInterpolation/GAMG/interfaceFields/cyclicAMIGAMGInterfaceField/cyclicAMIGAMGInterfaceField.C
@@ -325,6 +325,10 @@ void Foam::cyclicAMIGAMGInterfaceField::updateInterfaceMatrix
 
     const auto& cache = AMI.cache();
 
+    // Assume that sends are also OK
+    sendRequests_.clear();
+    sendRequests1_.clear();
+
     if (AMI.distributed() && AMI.comm() != -1)
     {
         if (commsType != UPstream::commsTypes::nonBlocking)
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
index 7d41d4e21e..24dafc3bb4 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
@@ -393,11 +393,11 @@ void Foam::cyclicAMIPolyPatch::resetAMI(const UList<point>& points) const
             label refProci = -1;
             if (size() > 0)
             {
-                refProci = UPstream::myProcNo();
+                refProci = UPstream::myProcNo(comm);
             }
             reduce(refProci, maxOp<label>(), UPstream::msgType(), comm);
 
-            if (refProci == UPstream::myProcNo())
+            if (refProci == UPstream::myProcNo(comm))
             {
                 refPt = points[meshPoints()[0]];
             }
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H
index 51f660f68e..7c6c514c3d 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H
@@ -99,7 +99,7 @@ protected:
         //- Index of other half
         mutable label nbrPatchID_;
 
-        //- Particle displacement fraction accross AMI
+        //- Particle displacement fraction across AMI
         const scalar fraction_;
 
 
diff --git a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatchTemplates.C b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatchTemplates.C
index 74d8a5594b..f0757d7e34 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatchTemplates.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPolyPatch/cyclicAMIPolyPatchTemplates.C
@@ -131,7 +131,7 @@ Foam::tmp<Foam::Field<Type>> Foam::cyclicAMIPolyPatch::interpolate
         const tensorField ownT(cs().R(this->faceCentres()));
 
         Field<Type> localDeflt(defaultValues.size());
-        if (defaultValues.size() == size())
+        if (defaultValues.size() != 0 && defaultValues.size() == size())
         {
             // Transform default values into cylindrical coords (using
             // *this faceCentres)
@@ -275,50 +275,48 @@ void Foam::cyclicAMIPolyPatch::initInterpolate
 
     if constexpr (transform_supported)
     {
-        const cyclicAMIPolyPatch& nbrPp = this->neighbPatch();
-
-        Field<Type> localFld(fld.size());
-
         // Only creates the co-ord system if using periodic AMI
         // - convert to cylindrical coordinate system
         auto cs = cylindricalCS();
 
         if (cs)
         {
+            Field<Type> localFld(fld.size());
+            const cyclicAMIPolyPatch& nbrPp = this->neighbPatch();
             const tensorField nbrT(cs().R(nbrPp.faceCentres()));
             Foam::invTransform(localFld, nbrT, fld);
+
+            initInterpolateUntransformed
+            (
+                localFld,
+                sendRequests,
+                recvRequests,
+                sendBuffers,
+                recvBuffers,
+
+                sendRequests1,
+                recvRequests1,
+                sendBuffers1,
+                recvBuffers1
+            );
+
+            return;
         }
-
-        initInterpolateUntransformed
-        (
-            localFld,
-            sendRequests,
-            recvRequests,
-            sendBuffers,
-            recvBuffers,
-
-            sendRequests1,
-            recvRequests1,
-            sendBuffers1,
-            recvBuffers1
-        );
     }
-    else
-    {
-        initInterpolateUntransformed
-        (
-            fld,
-            sendRequests,
-            recvRequests,
-            sendBuffers,
-            recvBuffers,
 
-            sendRequests1,
-            recvRequests1,
-            sendBuffers1,
-            recvBuffers1
-        );
-    }
+    initInterpolateUntransformed
+    (
+        fld,
+        sendRequests,
+        recvRequests,
+        sendBuffers,
+        recvBuffers,
+
+        sendRequests1,
+        recvRequests1,
+        sendBuffers1,
+        recvBuffers1
+    );
 }
 
 
@@ -333,9 +331,11 @@ Foam::tmp<Foam::Field<Type>> Foam::cyclicAMIPolyPatch::interpolate
     const UList<Type>& defaultValues
 ) const
 {
+    // Note: cannot be localFld.size() -> might have been set to null
     auto tresult = tmp<Field<Type>>::New(this->size(), Zero);
 
     const auto& AMI = (owner() ? this->AMI() : neighbPatch().AMI());
+
     const auto& cache = AMI.cache();
     cache.setDirection(owner());
 
@@ -426,7 +426,7 @@ Foam::tmp<Foam::Field<Type>> Foam::cyclicAMIPolyPatch::interpolate
     }
 
     const auto& localDefaultValues =
-        transform_supported ? localDeflt : defaultValues;
+        localDeflt.size() ? localDeflt : defaultValues;
 
     if (cache.index0() == -1 && cache.index1() == -1)
     {