diff --git a/llama/CMakeLists.txt b/llama/CMakeLists.txt
index e379d6a5..efd8fce4 100644
--- a/llama/CMakeLists.txt
+++ b/llama/CMakeLists.txt
@@ -40,6 +40,7 @@ endif()
 
 add_definitions(-DNAPI_VERSION=7)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+set(CMAKE_PLATFORM_NO_VERSIONED_SONAME ON)
 
 set(LLAMA_BUILD_COMMON ON)
 
diff --git a/llama/addon/globals/addonLog.cpp b/llama/addon/globals/addonLog.cpp
index c80820a5..4e66b316 100644
--- a/llama/addon/globals/addonLog.cpp
+++ b/llama/addon/globals/addonLog.cpp
@@ -94,12 +94,12 @@ void addonLlamaCppLogCallback(ggml_log_level level, const char* text, void* user
 }
 
 Napi::Value setLogger(const Napi::CallbackInfo& info) {
-    if (info.Length() < 1 || !info[0].IsFunction()) {
-        if (addonJsLoggerCallbackSet) {
-            addonJsLoggerCallbackSet = false;
-            addonThreadSafeLoggerCallback.Release();
-        }
+    if (addonJsLoggerCallbackSet) {
+        addonJsLoggerCallbackSet = false;
+        addonThreadSafeLoggerCallback.Release();
+    }
 
+    if (info.Length() < 1 || !info[0].IsFunction()) {
         return info.Env().Undefined();
     }
 
diff --git a/llama/cmake/addVariantSuffix.cmake b/llama/cmake/addVariantSuffix.cmake
index e5eb4954..064c5b62 100644
--- a/llama/cmake/addVariantSuffix.cmake
+++ b/llama/cmake/addVariantSuffix.cmake
@@ -1,5 +1,5 @@
 function(addVariantSuffix originalTarget variantSuffix)
-    if (NOT TARGET ${originalTarget} OR variantSuffix STREQUAL "")
+    if (NOT TARGET ${originalTarget} OR ${variantSuffix} STREQUAL "")
         return()
     endif()
 
diff --git a/templates/electron-typescript-react/src/utils/createRendererSideBirpc.ts b/templates/electron-typescript-react/src/utils/createRendererSideBirpc.ts
index 368b550c..2d308e57 100644
--- a/templates/electron-typescript-react/src/utils/createRendererSideBirpc.ts
+++ b/templates/electron-typescript-react/src/utils/createRendererSideBirpc.ts
@@ -1,14 +1,14 @@
 import {createBirpc} from "birpc";
 
 export function createRendererSideBirpc<
-    const RendererFunction = Record<string, never>,
-    const ElectronFunctions extends object = Record<string, never>
+    const ElectronFunction = Record<string, never>,
+    const RendererFunctions extends object = Record<string, never>
 >(
     toRendererEventName: string,
     fromRendererEventName: string,
-    electronFunctions: ElectronFunctions
+    rendererFunctions: RendererFunctions
 ) {
-    return createBirpc<RendererFunction, ElectronFunctions>(electronFunctions, {
+    return createBirpc<ElectronFunction, RendererFunctions>(rendererFunctions, {
         post: (data) => window.ipcRenderer.send(fromRendererEventName, data),
         on: (onData) => window.ipcRenderer.on(toRendererEventName, (event, data) => {
             onData(data);
@@ -17,4 +17,3 @@ export function createRendererSideBirpc<
         deserialize: (value) => JSON.parse(value)
     });
 }
-