diff --git a/Makefile b/Makefile
index f6ec553c..f103b949 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,7 @@ CFLAGS += \
 	-Wno-cast-function-type \
 	-MMD \
 	-ffunction-sections \
+	-fmerge-all-constants \
 	-fdata-sections \
 	-fno-exceptions \
 	-g
@@ -55,11 +56,12 @@ $(NONANDROID_TARGETS): CFLAGS += -fno-omit-frame-pointer
 $(NONANDROID_TARGETS): LDFLAGS += -rdynamic
 $(ANDROID_TARGETS): CFLAGS += \
 	--sysroot $(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/sysroot \
-	-fPIC \
 	-fdebug-compilation-dir . \
 	-fomit-frame-pointer \
 	-fno-asynchronous-unwind-tables
-$(ANDROID_TARGETS): LDFLAGS += --sysroot $(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/sysroot -fPIC
+	#-fPIC \
+$(ANDROID_TARGETS): LDFLAGS += --sysroot $(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/sysroot
+#-fPIC
 $(DEBUG_TARGETS): CFLAGS += -DDEBUG -Og
 $(RELEASE_TARGETS): CFLAGS += -DNDEBUG
 $(NONANDROID_RELEASE_TARGETS): CFLAGS += -O3
diff --git a/deps/openssl/android/x86_64/usr/local/bin/openssl b/deps/openssl/android/x86_64/usr/local/bin/openssl
index 4e5b4cc0..2506dceb 100755
Binary files a/deps/openssl/android/x86_64/usr/local/bin/openssl and b/deps/openssl/android/x86_64/usr/local/bin/openssl differ
diff --git a/src/ssb.c b/src/ssb.c
index 61822e7d..a936b70a 100644
--- a/src/ssb.c
+++ b/src/ssb.c
@@ -919,7 +919,7 @@ static bool _tf_ssb_verify_and_strip_signature_internal(JSContext* context, JSVa
 			if (!verified)
 			{
 				//tf_printf("crypto_sign_verify_detached fail (r=%d)\n", r);
-				if (false)
+				if (true)
 				{
 					tf_printf("val=[%.*s]\n", (int)strlen(sigstr), sigstr);
 					tf_printf("sig=%.*s\n", (int)(sigkind - str), str);
diff --git a/src/ssb.js.c b/src/ssb.js.c
index 056d6f61..b2ff6185 100644
--- a/src/ssb.js.c
+++ b/src/ssb.js.c
@@ -642,8 +642,7 @@ static JSValue _tf_ssb_sqlAsync(JSContext* context, JSValueConst this_val, int a
 static JSValue _tf_ssb_storeMessage(JSContext* context, JSValueConst this_val, int argc, JSValueConst* argv)
 {
 	tf_ssb_t* ssb = JS_GetOpaque(this_val, _tf_ssb_classId);
-	tf_ssb_verify_strip_and_store_message(ssb, argv[0]);
-	return JS_UNDEFINED;
+	return tf_ssb_verify_strip_and_store_message(ssb, argv[0]) ? JS_TRUE : JS_FALSE;
 }
 
 typedef struct _broadcasts_t