diff --git a/src/libraries/fiff/fiff_id.h b/src/libraries/fiff/fiff_id.h
index cbd8307370..7cf5c03940 100644
--- a/src/libraries/fiff/fiff_id.h
+++ b/src/libraries/fiff/fiff_id.h
@@ -189,7 +189,8 @@ inline qint32 FiffId::storageSize()
 inline bool operator== (const FiffId &a, const FiffId &b)
 {
     return (a.version == b.version &&
-            a.machid == b.machid &&
+            a.machid[0] == b.machid[0] &&
+            a.machid[1] == b.machid[1] &&
             a.time.secs == b.time.secs &&
             a.time.usecs == b.time.usecs);
 }
diff --git a/src/libraries/rtprocessing/averaging.cpp b/src/libraries/rtprocessing/averaging.cpp
index 3513fd534c..8e54a6a4f1 100644
--- a/src/libraries/rtprocessing/averaging.cpp
+++ b/src/libraries/rtprocessing/averaging.cpp
@@ -147,7 +147,7 @@ FiffEvoked RTPROCESSINGLIB::computeFilteredAverage(const FiffRawData& raw,
     MatrixXd timesDummy;
     MatrixXd times;
 
-    QScopedPointer<MNEEpochData> epoch(Q_NULLPTR);
+    std::unique_ptr<MNEEpochData> epoch(Q_NULLPTR);
     int iFilterDelay = filterKernel.getFilterOrder()/2;
 
     for (p = 0; p < count; ++p) {
@@ -184,10 +184,10 @@ FiffEvoked RTPROCESSINGLIB::computeFilteredAverage(const FiffRawData& raw,
             //Check if data block has the same size as the previous one
             if(!lstEpochDataList.isEmpty()) {
                 if(epoch->epoch.size() == lstEpochDataList.last()->epoch.size()) {
-                    lstEpochDataList.append(MNEEpochData::SPtr(epoch.take()));//List takes ownwership of the pointer - no delete need
+                    lstEpochDataList.append(MNEEpochData::SPtr(epoch.release()));//List takes ownwership of the pointer - no delete need
                 }
             } else {
-                lstEpochDataList.append(MNEEpochData::SPtr(epoch.take()));//List takes ownwership of the pointer - no delete need
+                lstEpochDataList.append(MNEEpochData::SPtr(epoch.release()));//List takes ownwership of the pointer - no delete need
             }
         } else {
             qWarning("[MNEEpochDataList::readEpochs] Can't read the event data segments.");