2 files changed, 4 insertions, 1 deletions
diff --git a/include/framework/scheduling/Epoch.h b/include/framework/scheduling/Epoch.h
index a1f865c..fe63c86 100644
--- a/include/framework/scheduling/Epoch.h
+++ b/include/framework/scheduling/Epoch.h
@@ -41,7 +41,7 @@ public:
         assert(m_active_jobs.load() == 0);
 
         for (auto buf : m_buffers) {
-            buf.release_reference();
+            buf->release_reference();
         }
 
         if (m_structure) {
@@ -111,6 +111,8 @@ public:
         if (m_structure) {
             epoch->m_structure = m_structure->copy();
         }
+
+        return epoch;
     }
 
 private:
diff --git a/include/framework/scheduling/Task.h b/include/framework/scheduling/Task.h
index 94c4d0a..d25c7c0 100644
--- a/include/framework/scheduling/Task.h
+++ b/include/framework/scheduling/Task.h
@@ -17,6 +17,7 @@ struct MergeArgs {
     Epoch<R, S, Q, L> *epoch;
     std::vector<MergeTask> merges;
     std::promise<bool> result;
+    void *extension;
 };
 
 template <RecordInterface R, ShardInterface S, QueryInterface Q, LayoutPolicy L>