diff --git a/Graphs/gLineOverlay.cpp b/Graphs/gLineOverlay.cpp
index 892e2bbe..950023bd 100644
--- a/Graphs/gLineOverlay.cpp
+++ b/Graphs/gLineOverlay.cpp
@@ -90,7 +90,6 @@ void gLineOverlayBar::paint(gGraph & w, int left, int topp, int width, int heigh
             ////////////////////////////////////////////////////////////////////////////
             // Skip data previous to minx bounds
             ////////////////////////////////////////////////////////////////////////////
-            quint32 idx;
             for (; dptr < eptr; dptr++) {
                 X=stime + *tptr;
                 if (X >= w.min_x)
diff --git a/SleepLib/calcs.cpp b/SleepLib/calcs.cpp
index 4cb1986b..48c1b9a3 100644
--- a/SleepLib/calcs.cpp
+++ b/SleepLib/calcs.cpp
@@ -188,7 +188,6 @@ void FlowParser::openFlow(Session * session, EventList * flow)
 
     // Begin with the second internal buffer
     EventDataType * buf=m_filtered;
-    EventDataType c;
     // Apply gain to waveform
     EventStoreType *eptr=inraw+m_samples;
 
diff --git a/SleepLib/event.cpp b/SleepLib/event.cpp
index 717b5a57..c3ab6666 100644
--- a/SleepLib/event.cpp
+++ b/SleepLib/event.cpp
@@ -158,7 +158,6 @@ void EventList::AddWaveform(qint64 start, qint16 * data, int recs, qint64 durati
     EventStoreType *edata=m_data.data();
 
     EventStoreType raw;
-    EventDataType val;
     qint16 * ep=data+recs;
     qint16 * sp;
     EventStoreType * dp=&edata[r];
@@ -175,9 +174,10 @@ void EventList::AddWaveform(qint64 start, qint16 * data, int recs, qint64 durati
         m_min=min;
         m_max=max;
     } else {
+        //register EventDataType val,gain=m_gain;
         for (sp=data; sp < ep; sp++) {
             *dp++=raw=*sp;
-            val=EventDataType(raw)*m_gain+m_offset;
+            //val=EventDataType(raw)*gain;
         }
     }
 
diff --git a/SleepLib/session.cpp b/SleepLib/session.cpp
index dce31455..1da6238c 100644
--- a/SleepLib/session.cpp
+++ b/SleepLib/session.cpp
@@ -1255,7 +1255,6 @@ EventDataType Session::avg(ChannelID id)
     double val=0,gain;
     int cnt=0;
     EventStoreType * dptr, * eptr;
-    int es;
     for (int i=0;i<evec.size();i++) {
         EventList & ev=*(evec[i]);
         dptr=ev.rawData();
diff --git a/mainwindow.cpp b/mainwindow.cpp
index a337d496..59a11255 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -2493,8 +2493,11 @@ void MainWindow::doReprocessEvents()
     // For each day in history
     int daycount=first.daysTo(date);
     int idx=0;
+
+    QList<Machine *> machines=PROFILE.GetMachines(MT_UNKNOWN);
+
     if (qprogress) {
-        qstatus->setText(tr("Recalculating Summaries"));
+        qstatus->setText(tr("Loading Event Data"));
         qprogress->setValue(0);
         qprogress->setVisible(true);
     }
@@ -2521,8 +2524,8 @@ void MainWindow::doReprocessEvents()
 
                 sess->UpdateSummaries();
                 sess->SetChanged(true);
-                sess->machine()->SaveSession(sess);
-                if (!isopen) sess->TrashEvents();
+                //sess->machine()->SaveSession(sess);
+                //if (!isopen) sess->TrashEvents();
             }
         }
         date=date.addDays(-1);
@@ -2532,6 +2535,11 @@ void MainWindow::doReprocessEvents()
        // }
 
     } while (date>=first);
+    qstatus->setText(tr("Recalculating Summaries"));
+    for (int i=0;i<machines.size();i++) {
+        machines.at(i)->Save();
+    }
+
     qstatus->setText(tr(""));
     qprogress->setVisible(false);
     if (!m_restartRequired) {
diff --git a/overview.cpp b/overview.cpp
index cdef4b38..1d85da49 100644
--- a/overview.cpp
+++ b/overview.cpp
@@ -227,7 +227,7 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
     //PR->setRecMinY(4.0);
     //PR->setRecMaxY(12.0);
 
-    CPAPMode mode=(CPAPMode)(int)PROFILE.calcSettingsMax(CPAP_Mode,MT_CPAP,PROFILE.FirstDay(MT_CPAP),PROFILE.LastDay(MT_CPAP));
+    //CPAPMode mode=(CPAPMode)(int)PROFILE.calcSettingsMax(CPAP_Mode,MT_CPAP,PROFILE.FirstDay(MT_CPAP),PROFILE.LastDay(MT_CPAP));
 
 //    //if (mode>=MODE_BIPAP) {
 //        pr->addSlice(CPAP_EPAP,QColor("green"),ST_SETMIN,true);
diff --git a/preferencesdialog.cpp b/preferencesdialog.cpp
index da39ed24..bbf8ac4e 100644
--- a/preferencesdialog.cpp
+++ b/preferencesdialog.cpp
@@ -302,9 +302,10 @@ bool PreferencesDialog::Save()
 
     // Restart if turning user event flagging on/off
     if (profile->cpap->userEventFlagging()!=ui->customEventGroupbox->isChecked()) {
-        if (!profile->cpap->userEventFlagging()) // Don't bother recalculating, just switch off
+        if (profile->cpap->userEventFlagging()) {
+            // Don't bother recalculating, just switch off
             needs_restart=true;
-        else recalc_events=true;
+        } else recalc_events=true;
     }
 
     if (profile->session->compressSessionData()!=ui->compressSessionData->isChecked())