diff --git a/fuzz/CMakeLists.txt b/fuzz/CMakeLists.txt
index 9007bc6f..668328b7 100644
--- a/fuzz/CMakeLists.txt
+++ b/fuzz/CMakeLists.txt
@@ -38,7 +38,13 @@ add_definitions("-DIO_SEPROXYHAL_BUFFER_SIZE_B=128") # cmake -DIO_SEPROXYHAL_BUF
 add_definitions("-DTARGET_NANOS=1")
 
 add_library(bsd STATIC IMPORTED)
-set_property(TARGET bsd PROPERTY IMPORTED_LOCATION /lib/x86_64-linux-gnu/libbsd.a)
+if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+    set_property(TARGET bsd PROPERTY IMPORTED_LOCATION /lib/x86_64-linux-gnu/libbsd.a)
+elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
+    set_property(TARGET bsd PROPERTY IMPORTED_LOCATION /lib/aarch64-linux-gnu/libbsd.a)
+else()
+    message(FATAL_ERROR "Unsupported platform: ${CMAKE_SYSTEM_PROCESSOR}")
+endif()
 
 include_directories(../libstellar/include)
 include_directories(${BOLOS_SDK}/lib_standard_app)
diff --git a/libstellar/base64.h b/libstellar/base64.h
index 5ca7597b..30bda702 100644
--- a/libstellar/base64.h
+++ b/libstellar/base64.h
@@ -3,4 +3,4 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-bool base64_encode(const uint8_t *data, size_t in_len, char *out, size_t out_len);
\ No newline at end of file
+bool base64_encode(const uint8_t *data, size_t in_len, char *out, size_t out_len);
diff --git a/libstellar/formatter.c b/libstellar/formatter.c
index 8c2dbeaf..6acbc4cd 100644
--- a/libstellar/formatter.c
+++ b/libstellar/formatter.c
@@ -2492,7 +2492,7 @@ static uint8_t get_data_count(formatter_data_t *fdata) {
     return op_cnt + 1;
 }
 
-void reset_formatter() {
+void reset_formatter(void) {
     explicit_bzero(formatter_stack, sizeof(formatter_stack));
     formatter_index = 0;
     current_data_index = 0;
@@ -2563,4 +2563,4 @@ bool get_next_data(formatter_data_t *fdata, bool forward, bool *data_exists, boo
     }
 
     return true;
-}
\ No newline at end of file
+}
diff --git a/libstellar/include/stellar/formatter.h b/libstellar/include/stellar/formatter.h
index 71b8e28a..376d3347 100644
--- a/libstellar/include/stellar/formatter.h
+++ b/libstellar/include/stellar/formatter.h
@@ -51,7 +51,7 @@ typedef struct {
 /**
  * Reset the formatter state.
  */
-void reset_formatter();
+void reset_formatter(void);
 
 /**
  * Get the next data to display.
diff --git a/libstellar/parser.c b/libstellar/parser.c
index 0e8ae406..d641a1af 100644
--- a/libstellar/parser.c
+++ b/libstellar/parser.c
@@ -1513,4 +1513,4 @@ bool parse_soroban_authorization_envelope(const uint8_t *data,
     //            envelope->soroban_authorization.sub_invocation_positions[i]);
     // }
     return true;
-}
\ No newline at end of file
+}
diff --git a/libstellar/printer.c b/libstellar/printer.c
index a9ced12f..98bd02a0 100644
--- a/libstellar/printer.c
+++ b/libstellar/printer.c
@@ -936,4 +936,4 @@ bool print_scv_string(const scv_string_t *scv_string, char *out, size_t out_len)
     }
 
     return true;
-}
\ No newline at end of file
+}