diff --git a/src/CubicSDRDefs.h b/src/CubicSDRDefs.h
index 9951cd6..f1ec469 100644
--- a/src/CubicSDRDefs.h
+++ b/src/CubicSDRDefs.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#define BUF_SIZE (16384*3)
-#define SRATE 1500000
+#define BUF_SIZE (16384*4)
+#define SRATE 2500000
 #define FFT_SIZE 2048
 
 #define DEFAULT_FREQ 98900000
diff --git a/src/visual/PrimaryGLContext.cpp b/src/visual/PrimaryGLContext.cpp
index 793132a..1876c47 100644
--- a/src/visual/PrimaryGLContext.cpp
+++ b/src/visual/PrimaryGLContext.cpp
@@ -54,7 +54,10 @@ void PrimaryGLContext::CheckGLError() {
 PrimaryGLContext::PrimaryGLContext(wxGLCanvas *canvas, wxGLContext *sharedContext) :
         wxGLContext(canvas, sharedContext) {
     SetCurrent(*canvas);
-
+    // Pre-load fonts
+    for (int i = 0; i < GLFONT_MAX; i++) {
+        getFont((GLFontSize)i);
+    }
     CheckGLError();
 }
 
diff --git a/src/visual/WaterfallCanvas.cpp b/src/visual/WaterfallCanvas.cpp
index 3c8e09f..5eeac20 100644
--- a/src/visual/WaterfallCanvas.cpp
+++ b/src/visual/WaterfallCanvas.cpp
@@ -444,7 +444,7 @@ void WaterfallCanvas::mouseReleased(wxMouseEvent& event) {
                 demod->run();
 
                 wxGetApp().bindDemodulator(demod);
-                wxGetApp().getDemodMgr().setActiveDemodulator(demod);
+                wxGetApp().getDemodMgr().setActiveDemodulator(demod,false);
             }
 
             if (demod == NULL) {
@@ -474,7 +474,7 @@ void WaterfallCanvas::mouseReleased(wxMouseEvent& event) {
             int freq = center_freq - (int) (0.5 * (float) SRATE) + (int) ((float) pos * (float) SRATE);
 
             wxGetApp().getDemodMgr().setActiveDemodulator(wxGetApp().getDemodMgr().getActiveDemodulator(), false);
-            nextDragState = WF_DRAG_NONE;
+            nextDragState = WF_DRAG_FREQUENCY;
         }
     } else if (dragState == WF_DRAG_RANGE) {
         float width = mTracker.getOriginDeltaMouseX();
@@ -503,7 +503,7 @@ void WaterfallCanvas::mouseReleased(wxMouseEvent& event) {
             demod->run();
 
             wxGetApp().bindDemodulator(demod);
-            wxGetApp().getDemodMgr().setActiveDemodulator(demod);
+            wxGetApp().getDemodMgr().setActiveDemodulator(demod,false);
         }
 
         if (demod == NULL) {