diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 6a9563700..9b87311f8 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -1609,7 +1609,7 @@ void MainWindow::showRhoEstimator()
 
 void MainWindow::showWorkoutWizard()
 {
-   WorkoutWizard *ww = new WorkoutWizard(this);
+   WorkoutWizard *ww = new WorkoutWizard(context);
    ww->show();
 }
 
diff --git a/src/ModelPlot.cpp b/src/ModelPlot.cpp
index 2cfa7e8b8..954def1f4 100644
--- a/src/ModelPlot.cpp
+++ b/src/ModelPlot.cpp
@@ -18,6 +18,7 @@
 
 #include "ModelPlot.h"
 #include "ModelWindow.h"
+#include "MainWindow.h"
 #include "IntervalItem.h"
 #include "RideItem.h"
 #include "Context.h"
@@ -1004,7 +1005,7 @@ ModelPlot::ModelPlot(Context *context, ModelSettings *settings) : QFrame(context
     setLineWidth(1);
     setFrameStyle(QFrame::NoFrame);
     setContentsMargins(0,0,0,0);
-    basicModelPlot = new BasicModelPlot(parent, settings);
+    basicModelPlot = new BasicModelPlot(context, settings);
     layout->addWidget(basicModelPlot);
     layout->setContentsMargins(2,2,2,2);
     setLayout(layout);
diff --git a/src/ModelWindow.cpp b/src/ModelWindow.cpp
index 3cc7f17d4..31442fa3f 100644
--- a/src/ModelWindow.cpp
+++ b/src/ModelWindow.cpp
@@ -18,6 +18,7 @@
 
 #include "ModelWindow.h"
 #include "ModelPlot.h"
+#include "MainWindow.h"
 #include "Context.h"
 #include "RideItem.h"
 #include "IntervalItem.h"
@@ -45,7 +46,7 @@ ModelWindow::addStandardChannels(QComboBox *box)
 }
 
 ModelWindow::ModelWindow(Context *context, const QDir &home) :
-    GcChartWindow(context), home(home), main(parent), ride(NULL), current(NULL)
+    GcChartWindow(context), home(home), context(context), ride(NULL), current(NULL)
 {
     setInstanceName("3D Window");
 
@@ -59,7 +60,7 @@ ModelWindow::ModelWindow(Context *context, const QDir &home) :
 
     // the plot widget
     QHBoxLayout *mainLayout = new QHBoxLayout;
-    modelPlot= new ModelPlot(main, NULL);
+    modelPlot= new ModelPlot(context, NULL);
     zpane = new QSlider(Qt::Vertical);
     zpane->setTickInterval(1);
     zpane->setMinimum(0);
@@ -150,7 +151,7 @@ ModelWindow::ModelWindow(Context *context, const QDir &home) :
     // now connect up the widgets
     //connect(main, SIGNAL(rideSelected()), this, SLOT(rideSelected()));
     connect(this, SIGNAL(rideItemChanged(RideItem*)), this, SLOT(rideSelected()));
-    connect(main, SIGNAL(intervalSelected()), this, SLOT(intervalSelected()));
+    connect(context->mainWindow, SIGNAL(intervalSelected()), this, SLOT(intervalSelected()));
     connect(presetValues, SIGNAL(currentIndexChanged(int)), this, SLOT(applyPreset(int)));
     connect(xSelector, SIGNAL(currentIndexChanged(int)), this, SLOT(setDirty()));
     connect(ySelector, SIGNAL(currentIndexChanged(int)), this, SLOT(setDirty()));
@@ -238,8 +239,8 @@ ModelWindow::setData(bool adjustPlot)
 
     // any intervals to plot?
     settings.intervals.clear();
-    for (int i=0; i<main->allIntervalItems()->childCount(); i++) {
-        IntervalItem *current = dynamic_cast<IntervalItem *>(main->allIntervalItems()->child(i));
+    for (int i=0; i<context->mainWindow->allIntervalItems()->childCount(); i++) {
+        IntervalItem *current = dynamic_cast<IntervalItem *>(context->mainWindow->allIntervalItems()->child(i));
         if (current != NULL && current->isSelected() == true)
                 settings.intervals.append(current);
     }
diff --git a/src/WorkoutWizard.cpp b/src/WorkoutWizard.cpp
index 6d68d1429..351506c49 100644
--- a/src/WorkoutWizard.cpp
+++ b/src/WorkoutWizard.cpp
@@ -17,6 +17,7 @@
  */
 
 #include "WorkoutWizard.h"
+#include "MainWindow.h"
 #include "Context.h"
 #include "Athlete.h"
 
@@ -740,9 +741,9 @@ void ImportPage::SaveWorkout()
     stream << "[END COURSE DATA]" << endl;
 }
 
-WorkoutWizard::WorkoutWizard(QWidget *parent) :QWizard(parent)
+WorkoutWizard::WorkoutWizard(Context *context) :QWizard(context->mainWindow)
 {
-    hackContext = (Context *)parent;
+    hackContext = context;
     setPage(WW_WorkoutTypePage, new WorkoutTypePage());
     setPage(WW_AbsWattagePage, new AbsWattagePage());
     setPage(WW_RelWattagePage, new RelWattagePage());
diff --git a/src/WorkoutWizard.h b/src/WorkoutWizard.h
index 2a3730375..f55de1607 100644
--- a/src/WorkoutWizard.h
+++ b/src/WorkoutWizard.h
@@ -323,7 +323,7 @@ class WorkoutWizard : public QWizard
 public:
     enum { WW_WorkoutTypePage, WW_AbsWattagePage, WW_RelWattagePage, WW_GradientPage, WW_ImportPage };
 
-    WorkoutWizard(QWidget *parent = NULL);
+    WorkoutWizard(Context *context);
 
     // called at the end of the wizard...
     void accept();