diff --git a/package/android/CMakeLists.txt b/package/android/CMakeLists.txt
index adff9c50..977104b8 100644
--- a/package/android/CMakeLists.txt
+++ b/package/android/CMakeLists.txt
@@ -66,7 +66,6 @@ endif()
 target_compile_options(
   ${CMAKE_PROJECT_NAME}
   PRIVATE
-  -DLOG_TAG=\"ReactNative\"
   -fexceptions
   -frtti
   -fstack-protector-all
diff --git a/package/cpp/logs.hpp b/package/cpp/logs.hpp
index c6036225..ca5000c1 100644
--- a/package/cpp/logs.hpp
+++ b/package/cpp/logs.hpp
@@ -1,37 +1,39 @@
+#pragma once
+
+#define NITRO_SQLITE_LOG_TAG "react-native-nitro-sqlite"
+
 #ifdef ANDROID
 // LOGS ANDROID
 #include <android/log.h>
-#define LOG_TAG "react-native-nitro-sqlite"
-#define LOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__)
-#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
-#define LOGI(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)
-#define LOGW(...) __android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__)
-#define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)
+#define LOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, NITRO_SQLITE_LOG_TAG, __VA_ARGS__)
+#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, NITRO_SQLITE_LOG_TAG, __VA_ARGS__)
+#define LOGI(...) __android_log_print(ANDROID_LOG_INFO, NITRO_SQLITE_LOG_TAG, __VA_ARGS__)
+#define LOGW(...) __android_log_print(ANDROID_LOG_WARN, NITRO_SQLITE_LOG_TAG, __VA_ARGS__)
+#define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, NITRO_SQLITE_LOG_TAG, __VA_ARGS__)
 #define LOGSIMPLE(...)
 #else
 // LOGS NO ANDROID
 #include <stdio.h>
-#define LOG_TAG "react-native-nitro-sqlite"
 #define LOGV(...)                                                                                                                          \
   printf("  ");                                                                                                                            \
   printf(__VA_ARGS__);                                                                                                                     \
-  printf("\t -  <%s> \n", LOG_TAG);
+  printf("\t -  <%s> \n", NITRO_SQLITE_LOG_TAG);
 #define LOGD(...)                                                                                                                          \
   printf("  ");                                                                                                                            \
   printf(__VA_ARGS__);                                                                                                                     \
-  printf("\t -  <%s> \n", LOG_TAG);
+  printf("\t -  <%s> \n", NITRO_SQLITE_LOG_TAG);
 #define LOGI(...)                                                                                                                          \
   printf("  ");                                                                                                                            \
   printf(__VA_ARGS__);                                                                                                                     \
-  printf("\t -  <%s> \n", LOG_TAG);
+  printf("\t -  <%s> \n", NITRO_SQLITE_LOG_TAG);
 #define LOGW(...)                                                                                                                          \
   printf("  * Warning: ");                                                                                                                 \
   printf(__VA_ARGS__);                                                                                                                     \
-  printf("\t -  <%s> \n", LOG_TAG);
+  printf("\t -  <%s> \n", NITRO_SQLITE_LOG_TAG);
 #define LOGE(...)                                                                                                                          \
   printf("  *** Error:  ");                                                                                                                \
   printf(__VA_ARGS__);                                                                                                                     \
-  printf("\t -  <%s> \n", LOG_TAG);
+  printf("\t -  <%s> \n", NITRO_SQLITE_LOG_TAG);
 #define LOGSIMPLE(...)                                                                                                                     \
   printf(" ");                                                                                                                             \
   printf(__VA_ARGS__);
diff --git a/package/cpp/operations.cpp b/package/cpp/operations.cpp
index a5404787..ceae408e 100644
--- a/package/cpp/operations.cpp
+++ b/package/cpp/operations.cpp
@@ -257,7 +257,7 @@ SQLiteOperationResult sqliteExecuteLiteral(const std::string& dbName, const std:
   bool isConsuming = true;
   bool isFailed = false;
 
-  int result, i, count, column_type;
+  int result;
   std::string column_name;
 
   while (isConsuming) {