diff --git a/sleepyhead/Graphs/gLineChart.cpp b/sleepyhead/Graphs/gLineChart.cpp
index 143a429a..422053ff 100644
--- a/sleepyhead/Graphs/gLineChart.cpp
+++ b/sleepyhead/Graphs/gLineChart.cpp
@@ -570,6 +570,11 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
                 num_points += (*ni)->count();
             }
 
+            if (code == CPAP_FlowRate) {
+                int i=5; Q_UNUSED(i);
+            }
+
+
             total_points += num_points;
             codepoints += num_points;
 
@@ -787,9 +792,6 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
                         //////////////////////////////////////////////////////////////////
                         // Normal Waveform Plot
                         //////////////////////////////////////////////////////////////////
-                        if (code == CPAP_Ti) {
-                            int i=5; Q_UNUSED(i);
-                        }
                         // Prime first point
                         data = (*ptr + el.offset()) * gain;
                         lastpx = xst + ((time - minx) * xmult);
diff --git a/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp b/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp
index 0c95da33..5395beec 100644
--- a/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp
+++ b/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp
@@ -460,12 +460,20 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
                 buf[i] = (buf[i] & 0x7f) | (msb & 0x01 ? 0x80 : 0);
             }
 
-            quint16 pi = buf[idx + 4] | buf[idx + 5] << 8;
+            quint16 pi1 = buf[idx + 4] | buf[idx + 5] << 8;
+            quint16 pi2 = buf[idx + 4] | ((char *)buf)[idx + 5] << 8;
+            quint16 pi3 = buf[idx + 4] | buf[idx + 5] << 7;
+            quint16 pi4 = buf[idx + 4] | ((char *)buf)[idx + 5] << 7;
+
+            qDebug() << "Pi1 =" << pi1
+                     << "Pi2 =" << pi2
+                     << "Pi3 =" << pi3
+                     << "Pi4 =" << pi4;
 
             pulse = buf[3];
             quint8 spo2 = buf[2];
 
-            oxirec->append(((spo2 == 0) || (pulse == 0)) ? OxiRecord(0,0,0) : OxiRecord(pulse, spo2, pi));
+            oxirec->append(((spo2 == 0) || (pulse == 0)) ? OxiRecord(0,0,0) : OxiRecord(pulse, spo2, pi3));
         } else if (res == 0x0f) {
             // f,80,de,c2,de,c2,de,c2  cms50F data...
 
diff --git a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
index bdc06d00..cd4afe7f 100644
--- a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
+++ b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
@@ -2286,7 +2286,7 @@ bool ResmedLoader::LoadPLD(Session *sess, const QString & path)
             a = sess->AddEventList(code, EVL_Waveform, es.gain, es.offset, 0, 0, rate);
             a->AddWaveform(edf.startdate, es.data, recs, duration);
             //a=ToTimeDelta(sess,edf,es, code,recs,duration,0,0);
-        } else if (es.label == "") {
+        } else if (es.label == "") { // What the hell resmed??
             if (emptycnt == 0) {
                 code = RMS9_E01;
                 ToTimeDelta(sess, edf, es, code, recs, duration);