diff --git a/src/AllPlotWindow.cpp b/src/AllPlotWindow.cpp
index c57cb47a9..dbd1715a7 100644
--- a/src/AllPlotWindow.cpp
+++ b/src/AllPlotWindow.cpp
@@ -36,7 +36,7 @@
 #include <qwt_arrow_button.h>
 
 AllPlotWindow::AllPlotWindow(MainWindow *mainWindow) :
-    QWidget(mainWindow), mainWindow(mainWindow)
+    QWidget(mainWindow), mainWindow(mainWindow), current(NULL)
 {
     QVBoxLayout *vlayout = new QVBoxLayout;
 
diff --git a/src/AllPlotWindow.h b/src/AllPlotWindow.h
index f5ed33d0a..54d990be2 100644
--- a/src/AllPlotWindow.h
+++ b/src/AllPlotWindow.h
@@ -99,7 +99,7 @@ class AllPlotWindow : public QWidget
         QSlider *smoothSlider;
         QLineEdit *smoothLineEdit;
 
-    RideItem *current;
+        RideItem *current;
 
     private:
         void showInfo(QString);
diff --git a/src/GoogleMapControl.cpp b/src/GoogleMapControl.cpp
index 06de56b56..43f613dfc 100644
--- a/src/GoogleMapControl.cpp
+++ b/src/GoogleMapControl.cpp
@@ -139,7 +139,7 @@ using namespace gm;
 
 #define GOOGLE_KEY "ABQIAAAAS9Z2oFR8vUfLGYSzz40VwRQ69UCJw2HkJgivzGoninIyL8-QPBTtnR-6pM84ljHLEk3PDql0e2nJmg"
 
-GoogleMapControl::GoogleMapControl(MainWindow *mw)
+GoogleMapControl::GoogleMapControl(MainWindow *mw) : current(NULL)
 {
     parent = mw;
     view = new QWebView();
diff --git a/src/ModelWindow.cpp b/src/ModelWindow.cpp
index c944934a2..eecf53341 100644
--- a/src/ModelWindow.cpp
+++ b/src/ModelWindow.cpp
@@ -46,7 +46,7 @@ ModelWindow::addStandardChannels(QComboBox *box)
 }
 
 ModelWindow::ModelWindow(MainWindow *parent, const QDir &home) :
-    QWidget(parent), home(home), main(parent), ride(NULL)
+    QWidget(parent), home(home), main(parent), ride(NULL), current(NULL)
 {
     // Layouts
     QVBoxLayout *mainLayout = new QVBoxLayout;
diff --git a/src/PfPvWindow.cpp b/src/PfPvWindow.cpp
index 4468fb9a9..a880d0dab 100644
--- a/src/PfPvWindow.cpp
+++ b/src/PfPvWindow.cpp
@@ -23,7 +23,7 @@
 #include <QtGui>
 
 PfPvWindow::PfPvWindow(MainWindow *mainWindow) :
-    QWidget(mainWindow), mainWindow(mainWindow)
+    QWidget(mainWindow), mainWindow(mainWindow), current(NULL)
 {
     QVBoxLayout *vlayout = new QVBoxLayout;
     QHBoxLayout *qaLayout = new QHBoxLayout;