diff --git a/firmware/console/binary/signature.cpp b/firmware/console/binary/signature.cpp
index a8fa9776d9..796e9aca63 100644
--- a/firmware/console/binary/signature.cpp
+++ b/firmware/console/binary/signature.cpp
@@ -28,6 +28,7 @@
 
 #define SIGNATURE_H QUOTE(SIGNATURE_NAME SHORT_BOARD_NAME SIGNATURE_EXT)
 
+#if !EFI_UNIT_TEST
 #include SIGNATURE_H
 
 #pragma message ("TS_SIGNATURE: " TS_SIGNATURE)
@@ -35,3 +36,4 @@
 const char *getTsSignature() {
 	return TS_SIGNATURE;
 }
+#endif
diff --git a/firmware/controllers/algo/airmass/airmass.h b/firmware/controllers/algo/airmass/airmass.h
index b913317a15..bf42d15e01 100644
--- a/firmware/controllers/algo/airmass/airmass.h
+++ b/firmware/controllers/algo/airmass/airmass.h
@@ -9,7 +9,8 @@ struct AirmassResult {
 	float EngineLoadPercent = 100;
 };
 
-struct AirmassModelBase {
+class AirmassModelBase {
+public:
 	DECLARE_ENGINE_PTR;
 
 	explicit AirmassModelBase(const ValueProvider3D& veTable);
diff --git a/firmware/util/efilib.h b/firmware/util/efilib.h
index e532f12108..8d6653d403 100644
--- a/firmware/util/efilib.h
+++ b/firmware/util/efilib.h
@@ -93,7 +93,7 @@ float tanf_taylor(float theta);
 
 #include <cstddef>
 
-#define IS_NEGATIVE_ZERO(value) (std::signbit(value) && value==0)
+#define IS_NEGATIVE_ZERO(value) (__builtin_signbit(value) && value==0)
 #define fixNegativeZero(value) (IS_NEGATIVE_ZERO(value) ? 0 : value)
 
 // C++ helpers go here