diff --git a/libNeonDomain/include/Neon/domain/details/bGrid/bField_imp.h b/libNeonDomain/include/Neon/domain/details/bGrid/bField_imp.h
index d92a4351..1ae2bf1d 100644
--- a/libNeonDomain/include/Neon/domain/details/bGrid/bField_imp.h
+++ b/libNeonDomain/include/Neon/domain/details/bGrid/bField_imp.h
@@ -312,8 +312,9 @@ auto bField<T, C, SBlock>::initHaloUpdateTable() -> void
                 T* srcMem = blockViewPartitions[Data::EndPoints::src]->mem();
                 T* dstMem = blockViewPartitions[Data::EndPoints::dst]->mem();
 
-                Neon::size_4d srcBoundaryBuff(boundaryZBeginIdx[Data::EndPoints::src][static_cast<int>(byDirection)], 0, 0, 0);
                 Neon::size_4d dstGhostBuff(ghostZBeginIdx[Data::EndPoints::dst][static_cast<int>(ByDirectionUtils::invert(byDirection))], 0, 0, 0);
+                Neon::size_4d srcBoundaryBuff(boundaryZBeginIdx[Data::EndPoints::src][static_cast<int>(byDirection)], 0, 0, 0);
+
                 size_t        transferDataBlockCount = mData->grid->mData->partitioner1D.getSpanLayout().getBoundsBoundary(setIdxVec[Data::EndPoints::src], byDirection).count;
 
                 //                std::cout << "To  " << dstGhostBuff << " prt " << blockViewPartitions[Data::EndPoints::dst]->prtID() << " From  " << srcBoundaryBuff << " prt " << blockViewPartitions[Data::EndPoints::src]->prtID() <<  std::endl;
diff --git a/libNeonDomain/include/Neon/domain/tools/SpaceCurves.h b/libNeonDomain/include/Neon/domain/tools/SpaceCurves.h
index 8535bfd0..b04c72c8 100644
--- a/libNeonDomain/include/Neon/domain/tools/SpaceCurves.h
+++ b/libNeonDomain/include/Neon/domain/tools/SpaceCurves.h
@@ -278,7 +278,7 @@ class Encoder
         uint64_t transform = 0;
         uint64_t out = 0;
 
-        for (int32_t i = 3 * (bits - 1); i >= 0; i -= 3) {
+        for (int32_t i = int(3 * (bits - 1)); i >= 0; i -= 3) {
             transform = lookupTable[transform | ((in >> i) & 7)];
             out = (out << 3) | (transform & 7);
             transform &= ~7;