Last couple of comments.
diff --git a/samples/drumthumper/src/main/java/com/google/oboe/sample/drumthumper/DrumThumperActivity.kt b/samples/drumthumper/src/main/java/com/google/oboe/sample/drumthumper/DrumThumperActivity.kt
index f953a35..3ab87db 100644
--- a/samples/drumthumper/src/main/java/com/google/oboe/sample/drumthumper/DrumThumperActivity.kt
+++ b/samples/drumthumper/src/main/java/com/google/oboe/sample/drumthumper/DrumThumperActivity.kt
@@ -110,11 +110,12 @@
 
     override fun onStart() {
         super.onStart()
+
+        mDrumPlayer.setupAudioStream()
+
         if (mUseDeviceChangeFallback) {
             mAudioMgr!!.registerAudioDeviceCallback(mDeviceListener, null)
         }
-
-        mDrumPlayer.setupAudioStream()
     }
 
     override fun onResume() {
diff --git a/samples/iolib/src/main/cpp/player/SimpleMultiPlayer.cpp b/samples/iolib/src/main/cpp/player/SimpleMultiPlayer.cpp
index f0ace32..a79f374 100644
--- a/samples/iolib/src/main/cpp/player/SimpleMultiPlayer.cpp
+++ b/samples/iolib/src/main/cpp/player/SimpleMultiPlayer.cpp
@@ -150,7 +150,7 @@
         delete mSampleSources[bufferIndex];
     }
 
-    mSampleSources.clear();
+    mSampleBuffers.clear();
     mSampleSources.clear();
 
     mNumSampleBuffers = 0;