diff --git a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
index 24a2ccbd..c47ea0b7 100644
--- a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
+++ b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
@@ -2633,6 +2633,7 @@ int ResmedLoader::Open(const QString & dirpath)
                 for (auto & sess : day->sessions) {
                     if (sess->type() == MT_CPAP) {
                         day->removeSession(sess);
+                        mach->sessionlist.remove(sess->session());
                         delete sess;
                     }
                 }
@@ -2675,8 +2676,6 @@ int ResmedLoader::Open(const QString & dirpath)
 
     finishAddingSessions();
 
-    mach->SaveSummary();
-
 #ifdef DEBUG_EFFICIENCY
     {
         qint64 totalbytes = 0;
diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp
index 1fecb3dc..2624be41 100644
--- a/sleepyhead/mainwindow.cpp
+++ b/sleepyhead/mainwindow.cpp
@@ -607,6 +607,12 @@ int MainWindow::importCPAP(ImportPath import, const QString &message)
 void MainWindow::finishCPAPImport()
 {
     p_profile->StoreMachines();
+    QList<Machine *> machines = p_profile->GetMachines(MT_CPAP);
+    for (Machine * mach : machines) {
+        mach->saveSessionInfo();
+        mach->SaveSummary();
+    }
+
     GenerateStatistics();
     profileSelector->updateProfileList();
 
@@ -1300,29 +1306,22 @@ void MainWindow::on_action_Screenshot_triggered()
 }
 void MainWindow::DelayedScreenshot()
 {
-    int w = width();
-    int h = height();
-
-    // Scale for high resolution displays (like Retina)
-#if(QT_VERSION>=QT_VERSION_CHECK(5,0,0))
+    // Make sure to scale for high resolution displays (like Retina)
     qreal pr = devicePixelRatio();
-    w /= pr;
-    h /= pr;
-#endif
 
-#if defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_HAIKU)
-    Q_UNUSED(w)
-    Q_UNUSED(h)
-     //QRect rec = QApplication::desktop()->screenGeometry();
 
+    QPixmap pixmap=grab();
+
+/*#if defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_HAIKU)
      // grab the whole screen
+    grab()
      QPixmap desktop = QPixmap::grabWindow(QApplication::desktop()->winId());
 
-     QPixmap pixmap = desktop.copy(x() * devicePixelRatio(), y() * devicePixelRatio(), (width()+6) * devicePixelRatio(), (height()+22) * devicePixelRatio());
+     QPixmap pixmap = desktop.copy(x() * pr, y() * pr, (width()+6) * pr, (height()+22) * pr);
 
 #elif defined(Q_OS_MAC)
-    QPixmap pixmap = QPixmap::grabWindow(this->winId(), x(), y(), w, h+10);
-#endif
+    QPixmap pixmap = QPixmap::grabWindow(this->winId(), x(), y(), width() / pr, (height() / pr) + 10);
+#endif */
 
     QString a = PREF.Get("{home}/Screenshots");
     QDir dir(a);