diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f51e825..82a4bbf 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -405,29 +405,52 @@ jobs:
           cd platforms/cpp/build
           ./wasm3_cpp_example
 
-  # Build as C++ (i.e. to run some C++-related checks)
-  build-as-cpp:
+  build-maintenance:
     runs-on: ubuntu-latest
     timeout-minutes: 10
 
     steps:
     - uses: actions/checkout@v1
-    - name: Run CMake
-      env:
-        CC: g++
-        CFLAGS: -xc++
+    - name: Build as C++
       run: |
         mkdir build
         cd build
-        cmake -DCMAKE_C_COMPILER_WORKS=1 ..
-    - name: Build
-      run: |
-        cmake --build build
+        g++ -xc++ -Dd_m3HasWASI \
+            -I../source ../source/*.c ../platforms/app/main.c \
+            -O3 -g0 -lm \
+            -o wasm3
     - name: Run spec tests
-      run: |
-        cd test
-        ./run-spec-test.py
+      run: cd test && python3 run-spec-test.py
     - name: Run WASI tests
+      run: cd test && python3 run-wasi-test.py --fast
+
+    - name: Build with debug logs
+      run: |
+        mkdir build-with-logs
+        cd build-with-logs
+        g++ -xc++ -Dd_m3HasWASI -Dd_m3LogsDefined \
+            -Dd_m3RuntimeStackDumps=1 \
+            -Dd_m3TraceExec=1 \
+            -Dd_m3LogParse=1 \
+            -Dd_m3LogModule=1 \
+            -Dd_m3LogCompile=1 \
+            -Dd_m3LogWasmStack=1 \
+            -Dd_m3LogEmit=1 \
+            -Dd_m3LogCodePages=1 \
+            -Dd_m3LogExec=1 \
+            -Dd_m3LogRuntime=1 \
+            -Dd_m3LogStackTrace=1 \
+            -Dd_m3LogNativeStack=1 \
+            -I../source ../source/*.c ../platforms/app/main.c \
+            -O3 -g0 -lm \
+            -o wasm3
+
+    - name: Build with pre-processed operators
       run: |
-        cd test
-        ./run-wasi-test.py
+        make -f extra/utils.mk preprocess
+        mkdir build-with-preprocess
+        cd build-with-preprocess
+        g++ -xc++ -Dd_m3HasWASI \
+            -I../source ../source/*.c ../platforms/app/main.c \
+            -O3 -g0 -lm \
+            -o wasm3
diff --git a/source/m3_config.h b/source/m3_config.h
index 7d275f2..cbbcdde 100644
--- a/source/m3_config.h
+++ b/source/m3_config.h
@@ -51,15 +51,13 @@
 //# endif
 
 // logging --------------------------------------------------------------------
+#ifndef d_m3LogsDefined
 
 # define d_m3EnableOpProfiling      0
 # define d_m3RuntimeStackDumps      0
 
 # define d_m3TraceExec              (1 && d_m3RuntimeStackDumps && DEBUG)
 
-
-// m3log (...) ----------------------------------------------------------------
-
 # define d_m3LogParse           0   // .wasm binary decoding info
 # define d_m3LogModule          0   // Wasm module info
 # define d_m3LogCompile         0   // wasm -> metacode generation phase
@@ -71,6 +69,8 @@
 # define d_m3LogStackTrace      0   // dump the call stack when traps occur
 # define d_m3LogNativeStack     0   // track the memory usage of the C-stack
 
+#endif
+
 // other ----------------------------------------------------------------------
 
 //#define d_m3SkipStackCheck