diff --git a/CMakeLists.txt b/CMakeLists.txt
index d4e5e15..c611bdf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,14 @@ add_compile_definitions(VERSION_MAJOR=1)
 add_compile_definitions(VERSION_MINOR=0)
 add_compile_definitions(VERSION_CODENAME="Reworked")
 
+# NDK Settings
+if (NOT ANDROID_ABI)
+    set(ANDROID_ABI arm64-v8a)
+endif()
+if (NOT ANDROID_PLATFORM)
+    set(ANDROID_PLATFORM android-23)
+endif()
+
 # KISS FFT
 set(KISSFFT_PKGCONFIG OFF)
 set(KISSFFT_STATIC ON)
diff --git a/src/cpp/ViPER4Android.cpp b/src/cpp/ViPER4Android.cpp
index 9556792..68412f1 100644
--- a/src/cpp/ViPER4Android.cpp
+++ b/src/cpp/ViPER4Android.cpp
@@ -142,7 +142,7 @@ static int32_t Viper_ICommand(effect_handle_t self,
             return 0;
         }
         case EFFECT_CMD_SET_PARAM: {
-            auto pCmdParam = (effect_param_t *) pCmdData;
+            auto *pCmdParam = reinterpret_cast<effect_param_t *>(pCmdData);
             // The value offset of an effect parameter is computed by rounding up
             // the parameter size to the next 32 bit alignment.
             uint32_t vOffset = ((pCmdParam->psize + sizeof(int32_t) - 1) / sizeof(int32_t)) * sizeof(int32_t);
@@ -179,7 +179,6 @@ static int32_t Viper_ICommand(effect_handle_t self,
         case EFFECT_CMD_GET_PARAM: {
             auto *pCmdParam = reinterpret_cast<effect_param_t *>(pCmdData);
             auto *pReplyParam = reinterpret_cast<effect_param_t *>(pReplyData);
-
             // The value offset of an effect parameter is computed by rounding up
             // the parameter size to the next 32 bit alignment.
             uint32_t vOffset = ((pCmdParam->psize + sizeof(int32_t) - 1) / sizeof(int32_t)) * sizeof(int32_t);