diff --git a/app/build.gradle b/app/build.gradle
index 49cc959..9f0dd27 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,6 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 28
+    namespace "org.billthefarmer.miditest"
 
     defaultConfig {
         applicationId "org.billthefarmer.miditest"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 531d5e3..5f30610 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.billthefarmer.miditest">
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
   <application
       android:allowBackup="true"
diff --git a/build.gradle b/build.gradle
index e2a5b0f..6682f1d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.3.1'
 
         // NOTE: Do not place your application dependencies here; they
         // belong in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2e6e589..41dfb87 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/library/build.gradle b/library/build.gradle
index ba09256..9f59f80 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -6,6 +6,7 @@ plugins {
 
 android {
     compileSdkVersion 28
+    namespace "org.billthefarmer.mididriver"
 
     externalNativeBuild {
         ndkBuild {
@@ -37,8 +38,6 @@ android {
     lintOptions {
         disable 'OldTargetApi', 'ExpiredTargetSdkVersion'
     }
-
-    namespace = 'org.billthefarmer.mididriver'
 }
 
 afterEvaluate {
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
index d621909..8072ee0 100644
--- a/library/src/main/AndroidManifest.xml
+++ b/library/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.billthefarmer.mididriver" />
\ No newline at end of file
+<manifest />
diff --git a/library/src/main/jni/lib_src/eas_dlssynth.c b/library/src/main/jni/lib_src/eas_dlssynth.c
index 8606a29..a07262c 100644
--- a/library/src/main/jni/lib_src/eas_dlssynth.c
+++ b/library/src/main/jni/lib_src/eas_dlssynth.c
@@ -348,11 +348,24 @@ EAS_RESULT DLS_StartVoice (S_VOICE_MGR *pVoiceMgr, S_SYNTH *pSynth, S_SYNTH_VOIC
     pWTVoice->phaseAccum = (EAS_U32) pSynth->pDLS->pDLSSamples + pSynth->pDLS->pDLSSampleOffsets[pDLSRegion->wtRegion.waveIndex];
     if (pDLSRegion->wtRegion.region.keyGroupAndFlags & REGION_FLAG_IS_LOOPED)
     {
+#if defined (_8_BIT_SAMPLES)
         pWTVoice->loopStart = pWTVoice->phaseAccum + pDLSRegion->wtRegion.loopStart;
         pWTVoice->loopEnd = pWTVoice->phaseAccum + pDLSRegion->wtRegion.loopEnd - 1;
+#else //_16_BIT_SAMPLES
+        pWTVoice->loopStart = pWTVoice->phaseAccum + (pDLSRegion->wtRegion.loopStart<<1);
+        pWTVoice->loopEnd = pWTVoice->phaseAccum + (pDLSRegion->wtRegion.loopEnd<<1) - 2;
+#endif
     }
     else
-        pWTVoice->loopStart = pWTVoice->loopEnd = pWTVoice->phaseAccum + pSynth->pDLS->pDLSSampleLen[pDLSRegion->wtRegion.waveIndex] - 1;
+    {
+#if defined (_8_BIT_SAMPLES)
+       pWTVoice->loopStart = pWTVoice->loopEnd = pWTVoice->phaseAccum
+                + pSynth->pDLS->pDLSSampleLen[pDLSRegion->wtRegion.waveIndex] - 1;
+#else //_16_BIT_SAMPLES
+        pWTVoice->loopStart = pWTVoice->loopEnd = pWTVoice->phaseAccum
+                + pSynth->pDLS->pDLSSampleLen[pDLSRegion->wtRegion.waveIndex] - 2;
+#endif
+    }
 
     return EAS_SUCCESS;
 }
diff --git a/library/src/main/jni/midi.cpp b/library/src/main/jni/midi.cpp
index 3bc82e0..6c04905 100644
--- a/library/src/main/jni/midi.cpp
+++ b/library/src/main/jni/midi.cpp
@@ -21,6 +21,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <jni.h>
+#include <assert.h>
 #include <pthread.h>
 
 #include <android/log.h>