diff --git a/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/queries/q7.sqlpp.dis b/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/queries/q7.sqlpp
similarity index 100%
rename from asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/queries/q7.sqlpp.dis
rename to asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/queries/q7.sqlpp
diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/buffermanager/TupleInFrameListAccessor.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/buffermanager/TupleInFrameListAccessor.java
index 2c9d24a..aadcb26 100644
--- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/buffermanager/TupleInFrameListAccessor.java
+++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/buffermanager/TupleInFrameListAccessor.java
@@ -24,8 +24,7 @@
 
 import org.apache.hyracks.api.comm.IFrameTupleAccessor;
 import org.apache.hyracks.api.dataflow.value.RecordDescriptor;
-import org.apache.hyracks.dataflow.std.sort.util.DeletableFrameTupleAppender;
-import org.apache.hyracks.dataflow.std.sort.util.IAppendDeletableFrameTupleAccessor;
+import org.apache.hyracks.dataflow.common.comm.io.FrameTupleAccessor;
 import org.apache.hyracks.dataflow.std.structures.TuplePointer;
 
 /**
@@ -33,11 +32,11 @@
  */
 public class TupleInFrameListAccessor extends AbstractTuplePointerAccessor {
 
-    private IAppendDeletableFrameTupleAccessor bufferAccessor;
+    private IFrameTupleAccessor bufferAccessor;
     private List<ByteBuffer> bufferFrames;
 
     public TupleInFrameListAccessor(RecordDescriptor rd, List<ByteBuffer> bufferFrames) {
-        bufferAccessor = new DeletableFrameTupleAppender(rd);
+        bufferAccessor = new FrameTupleAccessor(rd);
         this.bufferFrames = bufferFrames;
     }