diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
index 05b4a73..841b1b2 100644
--- a/.github/workflows/build_cmake.yml
+++ b/.github/workflows/build_cmake.yml
@@ -17,7 +17,7 @@ env:
 
 jobs:
   build-linux:
-    name: ${{ matrix.os }} ${{ matrix.build_type }} ${{ matrix.cxx }}
+    name: ${{ matrix.os }} ${{ matrix.build_type }} ${{ matrix.cxx }} CXX-${{matrix.cxx_version}}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -86,14 +86,14 @@ jobs:
           version=$(grep "project("  CMakeLists.txt | cut -d ' ' -f3)
           echo "VERSION=$version" >> "$GITHUB_ENV"
       - name: Upload rexsapi package
-        if: ${{ matrix.build_type == 'Release' && matrix.cxx == 'g++' }}
+        if: ${{ matrix.build_type == 'Release' && matrix.cxx == 'g++' && matrix.cxx_version == 17 }}
         uses: actions/upload-artifact@v4
         with:
           name: rexsapi-linux-${{env.VERSION}}
           path: build/rexsapi-linux-*.zip
 
   build-macos:
-    name: ${{ matrix.os }} ${{ matrix.build_type }}
+    name: ${{ matrix.os }} ${{ matrix.build_type }} CXX-${{matrix.cxx_version}}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -122,14 +122,14 @@ jobs:
           version=$(grep "project("  CMakeLists.txt | cut -d ' ' -f3)
           echo "VERSION=$version" >> "$GITHUB_ENV"
       - name: Upload rexsapi package
-        if: ${{ matrix.build_type == 'Release' }}
+        if: ${{ matrix.build_type == 'Release' && matrix.cxx_version == 17 }}
         uses: actions/upload-artifact@v4
         with:
           name: rexsapi-darwin-${{env.VERSION}}
           path: build/rexsapi-darwin-*.zip
 
   build-windows:
-    name: ${{ matrix.os }} ${{ matrix.build_type }}
+    name: ${{ matrix.os }} ${{ matrix.build_type }} CXX-${{matrix.cxx_version}}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -171,7 +171,7 @@ jobs:
                         env.write(entry.format(m.group(1)))
         shell: python
       - name: Upload rexsapi package
-        if: ${{ matrix.build_type == 'Release' }}
+        if: ${{ matrix.build_type == 'Release' && matrix.cxx_version == 17 }}
         uses: actions/upload-artifact@v4
         with:
           name: rexsapi-windows-${{env.VERSION}}
diff --git a/include/rexsapi/Types.hxx b/include/rexsapi/Types.hxx
index 44412e6..7d764b2 100644
--- a/include/rexsapi/Types.hxx
+++ b/include/rexsapi/Types.hxx
@@ -21,7 +21,7 @@
 #include <rexsapi/Exception.hxx>
 #include <rexsapi/Format.hxx>
 
-#if (__cplusplus >= 202002L || _MSVC_LANG >= 202002L) && not __APPLE__
+#if ((__cplusplus >= 202002L || _MSVC_LANG >= 202002L) && !defined(__APPLE__))
 #include <chrono>
 namespace rexs_date = std::chrono;
 namespace rexs_format = std;
diff --git a/test/TypesTest.cxx b/test/TypesTest.cxx
index e0c081d..c22b687 100644
--- a/test/TypesTest.cxx
+++ b/test/TypesTest.cxx
@@ -159,7 +159,7 @@ TEST_CASE("Datetime test")
   SUBCASE("Parse")
   {
     const rexsapi::TDatetime dt{"2023-03-28T13:49:36+02:00"};
-#if (__cplusplus >= 202002L || _MSVC_LANG >= 202002L) && not __APPLE__
+#if ((__cplusplus >= 202002L || _MSVC_LANG >= 202002L) && !defined(__APPLE__))
     auto rexs_march = std::chrono::March;
 #else
     auto rexs_march = date::mar;