diff --git a/.gitignore b/.gitignore
index 0733b4c180..1d7b0a06a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ cmake_targets/*/build/
 cmake_targets/ran_build/
 log/
 lte_build_oai/
+build*
 
 # IDE files
 .vscode
diff --git a/common/utils/ds/spsc_q.h b/common/utils/ds/spsc_q.h
index 7fd968b2f0..1149a80f7d 100644
--- a/common/utils/ds/spsc_q.h
+++ b/common/utils/ds/spsc_q.h
@@ -7,11 +7,13 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <stdatomic.h>
 
 #if defined(__cplusplus)
+#include <atomic>
 // use atomic_size_t to help interworking with C++
 using std::atomic_size_t;
+#else
+#include <stdatomic.h>
 #endif
 
 typedef struct spsc_q {
diff --git a/openair1/SIMULATION/tests/CMakeLists.txt b/openair1/SIMULATION/tests/CMakeLists.txt
index 2235cd2771..65bb102874 100644
--- a/openair1/SIMULATION/tests/CMakeLists.txt
+++ b/openair1/SIMULATION/tests/CMakeLists.txt
@@ -39,7 +39,7 @@ function(add_physim_test test_name test_description test_exec)
     # pass test description also through environment variable: for cmake < 3.30,
     # in JSON export, we cannot recover the description otherwise
     # see also https://gitlab.kitware.com/cmake/cmake/-/issues/21490
-    ENVIRONMENT "LD_LIBRARY_PATH=.;TEST_DESCRIPTION=${test_description}"
+    ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR};TEST_DESCRIPTION=${test_description}"
   )
   set_tests_properties(${test_name} PROPERTIES CHECK_COUNT 0)
   add_dependencies(tests ${test_exec})