diff --git a/CMakeLists.txt b/CMakeLists.txt
index 414417a..6e7438f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,8 +94,14 @@ if (WIN32)
 endif()
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  if (NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
+  if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
     target_compile_options(snmalloc_lib INTERFACE -mcx16)
+  elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "amd64")
+   target_compile_options(snmalloc_lib INTERFACE -mcx16)
+  elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64")
+   target_compile_options(snmalloc_lib INTERFACE -mcx16)
+  elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86")
+   target_compile_options(snmalloc_lib INTERFACE -mcx16)
   endif()
 endif ()
 
diff --git a/src/aal/aal.h b/src/aal/aal.h
index a62aee4..4f5355f 100644
--- a/src/aal/aal.h
+++ b/src/aal/aal.h
@@ -28,7 +28,7 @@ namespace snmalloc
      */
     IntegerPointers = (1 << 0),
     /**
-     * This architecture cannot access cpu cycles counters from userspace
+     * This architecture cannot access cpu cycles counters.
      */
     NoCpuCycleCounters = (1 << 1),
   };
diff --git a/src/ds/bits.h b/src/ds/bits.h
index 6f3621e..12c9bdc 100644
--- a/src/ds/bits.h
+++ b/src/ds/bits.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <limits>
 #include <cstddef>
+#include <limits>
 
 // #define USE_LZCNT
 
diff --git a/src/pal/pal_posix.h b/src/pal/pal_posix.h
index 4344ad4..4c3a842 100644
--- a/src/pal/pal_posix.h
+++ b/src/pal/pal_posix.h
@@ -3,8 +3,8 @@
 #include "../ds/address.h"
 #include "../mem/allocconfig.h"
 
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/mman.h>
 
 extern "C" int puts(const char* str);