diff --git a/oscar/SleepLib/loader_plugins/resmed_loader.cpp b/oscar/SleepLib/loader_plugins/resmed_loader.cpp
index 7e37534c..cbf0fe37 100644
--- a/oscar/SleepLib/loader_plugins/resmed_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/resmed_loader.cpp
@@ -3117,8 +3117,8 @@ void ResmedLoader::initChannels()
         QObject::tr("Climate Control"),
         "", LOOKUP, Qt::black));
 
-    chan->addOption(0, QObject::tr("Manual"));
-    chan->addOption(1, QObject::tr("Auto"));
+    chan->addOption(0, QObject::tr("Auto"));
+    chan->addOption(1, QObject::tr("Manual"));
 
     channel.add(GRP_CPAP, chan = new Channel(RMS9_Mask= 0xe20C, SETTING, MT_CPAP, SESSION,
         "RMS9_Mask", QObject::tr("Mask"),
diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp
index e3cea829..dd7fc6a3 100644
--- a/oscar/statistics.cpp
+++ b/oscar/statistics.cpp
@@ -1011,13 +1011,14 @@ QString Statistics::GenerateHTML()
     // Compute number of monthly periods for a monthly rather than standard time distribution
     int number_periods = 0;
     if (p_profile->general->statReportMode() == STAT_MODE_MONTHLY) {
-        QDate beginDate = qMax(firstcpap, lastcpap.addYears(-1));
-        int beginMonth = beginDate.month();
+        int firstMonth = firstcpap.month();
         int lastMonth = lastcpap.month();
-        if (lastMonth < beginMonth) lastMonth += 12; // handle time extending to next year
-        number_periods = lastMonth - beginMonth + 1;
+        if (lastMonth <= firstMonth && firstcpap.year() != lastcpap.year())
+            lastMonth += 12; // handle time extending to next year
+        number_periods = lastMonth - firstMonth + 1;
+
         if (number_periods < 1) {
-            qDebug() << "*** Begin" << beginDate << "beginMonth" << beginMonth << "lastMonth" << lastMonth << "periods" << number_periods;
+            qDebug() << "*** Begin" << firstcpap << "beginMonth" << firstMonth << "lastMonth" << lastMonth << "periods" << number_periods;
             number_periods = 1;
         }
         // But not more than one year