diff --git a/src/boundary/BoundaryHandling.h b/src/boundary/BoundaryHandling.h
index 96f93c991b7dc80579317daf06940b03d7c98525..cf724cdc15f5ad90ec3aa543dfc2e2f99be5ca7b 100644
--- a/src/boundary/BoundaryHandling.h
+++ b/src/boundary/BoundaryHandling.h
@@ -2230,7 +2230,7 @@ inline void BoundaryHandling< FlagField_T, Stencil, Boundaries... >::operator()(
 
    WALBERLA_ASSERT( checkConsistency( localCells ) );
 
-   #ifdef _OPENMP
+   #if defined(_OPENMP) && !(defined(_MSC_VER) && _MSC_VER < 1925)
    const int zMin = int_c( localCells.zMin() );
    const int zMax = int_c( localCells.zMax() );
    #pragma omp parallel for schedule(static) if(threadSafeBCs_)
diff --git a/src/field/Field.impl.h b/src/field/Field.impl.h
index e1515cb755ad92bbc2fdccebe7c2b4eb175a5ac2..4856de7ee9ccf80b1f7203e15a4e248ec3c5c049 100644
--- a/src/field/Field.impl.h
+++ b/src/field/Field.impl.h
@@ -318,6 +318,12 @@ namespace field {
       {
 #ifdef __BIGGEST_ALIGNMENT__
          const uint_t alignment = __BIGGEST_ALIGNMENT__;
+#elif defined(__AVX512F__)
+         const uint_t alignment = 64;
+#elif defined(__AVX__)
+         const uint_t alignment = 32;
+#elif defined(__SSE__) || defined(_MSC_VER)
+         const uint_t alignment = 16;
 #else
          const uint_t alignment = 64;
 #endif