diff --git a/src/common/FFlist.h b/src/common/FFlist.h
index b380f6cf7..44ef92297 100644
--- a/src/common/FFlist.h
+++ b/src/common/FFlist.h
@@ -131,7 +131,7 @@ static inline void ffListReserve(FFlist* list, uint32_t elementSize, uint32_t ne
     ({                                                                                                                                 \
         typedef __typeof__(*(pCompElement)) compElementType;                                                                           \
         typedef bool compFuncType(const compElementType*, const compElementType*);                                                     \
-        static_assert(__builtin_types_compatible_p(__typeof__(compFunc), compFuncType), "In compatible callback function");            \
+        static_assert(__builtin_types_compatible_p(__typeof__(compFunc), compFuncType), "Incompatible callback function");             \
         ffListContains(&(listVar), (uint32_t) sizeof(*(pCompElement)), (pCompElement), (bool (*)(const void*, const void*)) compFunc); \
     })
 
diff --git a/src/common/attributes.h b/src/common/attributes.h
index 2a91c01ed..8cfba29c4 100644
--- a/src/common/attributes.h
+++ b/src/common/attributes.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#ifdef _MSC_VER
+#ifndef __has_attribute
+    #error Unsupported compiler
     #define __attribute__(x)
 #endif
 
diff --git a/src/common/impl/debug_windows.c b/src/common/impl/debug_windows.c
index 8bcfe5311..fb76a659e 100644
--- a/src/common/impl/debug_windows.c
+++ b/src/common/impl/debug_windows.c
@@ -13,7 +13,7 @@ const char* ffDebugWin32Error(DWORD errorCode) {
         (DWORD) errorCode,
         0,
         bufferW,
-        sizeof(buffer),
+        ARRAY_SIZE(bufferW),
         NULL);
 
     if (len == 0) {
diff --git a/tests/list.c b/tests/list.c
index c0ead67de..2184dd79c 100644
--- a/tests/list.c
+++ b/tests/list.c
@@ -5,8 +5,9 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdnoreturn.h>
 
-__attribute__((__noreturn__)) static void testFailed(const FFlist* list, const char* expression, int lineNo) {
+noreturn static void testFailed(const FFlist* list, const char* expression, int lineNo) {
     fputs(FASTFETCH_TEXT_MODIFIER_ERROR, stderr);
     fprintf(stderr, "[%d] %s, list:", lineNo, expression);
     for (uint32_t i = 0; i < list->length; ++i) {
diff --git a/tests/strbuf.c b/tests/strbuf.c
index ef6fca671..12ceac30c 100644
--- a/tests/strbuf.c
+++ b/tests/strbuf.c
@@ -4,8 +4,9 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdnoreturn.h>
 
-__attribute__((__noreturn__)) static void testFailed(const FFstrbuf* strbuf, const char* expression, int lineNo) {
+noreturn static void testFailed(const FFstrbuf* strbuf, const char* expression, int lineNo) {
     fputs(FASTFETCH_TEXT_MODIFIER_ERROR, stderr);
     fprintf(stderr, "[%d] %s, strbuf:", lineNo, expression);
     ffStrbufWriteTo(strbuf, stderr);