diff --git a/src/contrib/waveout/WaveOut.h b/src/contrib/waveout/WaveOut.h
index 86339127c..706420f39 100644
--- a/src/contrib/waveout/WaveOut.h
+++ b/src/contrib/waveout/WaveOut.h
@@ -37,7 +37,7 @@ public: unsigned long GetChannels()     const   { return m_waveFormatPCMEx.Forma
 public: unsigned long GetBlockSize()    const   { return m_BlockSize; }
 //TODO: decide how to set this when integrating with mC2
 public: unsigned long GetOutputDevice() const   { return WAVE_MAPPER; }; 
-public: unsigned long GetBufferSizeMs() const   { return 300;         };
+public: unsigned long GetBufferSizeMs() const   { return 1500;         };
 
 private: unsigned long ThreadProc(void);
 
diff --git a/src/core/audio/Transport.cpp b/src/core/audio/Transport.cpp
index e139215e1..2ef35b720 100644
--- a/src/core/audio/Transport.cpp
+++ b/src/core/audio/Transport.cpp
@@ -192,7 +192,7 @@ unsigned long Transport::TrackPosition() const
 
 unsigned long Transport::TrackLength() const
 {
-    if (this->activeStream)   return this->openStreams[0]->LengthMs();
+    if (this->activeStream)   return this->activeStream->LengthMs();
     else                      return 0;
 }
 
diff --git a/src/cube/TransportController.cpp b/src/cube/TransportController.cpp
index 386d8764d..90b7519a7 100644
--- a/src/cube/TransportController.cpp
+++ b/src/cube/TransportController.cpp
@@ -205,7 +205,6 @@ void TransportController::OnPlaybackStarted(musik::core::TrackPtr track)
     this->transportView.playButton->SetCaption(_T("Pause"));
 
     this->transportView.timeDurationLabel->SetCaption(this->FormatTime(musik::core::PlaybackQueue::Instance().Transport().TrackLength()));
-   // this->transportView.timeDurationLabel->SetCaption(track->GetValue("duration"));
     
     this->transportView.playbackSlider->SetPosition(0);
     
@@ -222,12 +221,13 @@ void TransportController::OnPlaybackStopped(musik::core::TrackPtr track)
         return;
     }
 
-    this->playing = false;
-    this->paused = false;
-    this->transportView.playButton->SetCaption(_T("Play"));
-
     if (this->displayedTrack->id == track->id) // For out of order signals
     {
+        this->playing = false;
+        this->paused = false;
+
+        this->transportView.playButton->SetCaption(_T("Play"));
+
         this->transportView.playbackSlider->SetPosition(0);
         this->playbackSliderTimer.Stop();