diff --git a/Makefile b/Makefile
index be8ed03e1b..510419a075 100644
--- a/Makefile
+++ b/Makefile
@@ -255,7 +255,7 @@ status-go-ios: ##@status-go Compile status-go for iOS app
 
 status-go-library: SHELL := /bin/sh
 status-go-library: ##@status-go Compile status-go for node-js
-	unzip -d ./result/ status-go-library.zip
+	unzip -j -o -d ./result/ status-go-library.zip
 
 #--------------
 # Watch, Build & Review changes
@@ -338,9 +338,11 @@ _test-clojure: export WATCH ?= false
 _test-clojure: status-go-library
 _test-clojure:
 ifeq ($(WATCH), true)
+	yarn node-pre-gyp rebuild && \
 	yarn shadow-cljs compile mocks && \
 	nodemon --exec "yarn shadow-cljs compile test && node --require ./test-resources/override.js $$SHADOW_OUTPUT_TO" -e cljs
 else
+	yarn node-pre-gyp rebuild && \
 	yarn shadow-cljs compile mocks && \
 	yarn shadow-cljs compile test && \
 	node --require ./test-resources/override.js "$$SHADOW_OUTPUT_TO"
diff --git a/modules/react-native-status/nodejs/status.cpp b/modules/react-native-status/nodejs/status.cpp
index 597491e446..620d77032c 100644
--- a/modules/react-native-status/nodejs/status.cpp
+++ b/modules/react-native-status/nodejs/status.cpp
@@ -9,7 +9,7 @@
 #include <string>
 #include <queue>
 
-#include "../../../result/status-go-library/libstatus.h"
+#include "../../../result/libstatus.h"
 
 namespace status {