diff --git a/ext/byte_buffer.cc b/ext/byte_buffer.cc
index 7eff11c2..fe7735d4 100644
--- a/ext/byte_buffer.cc
+++ b/ext/byte_buffer.cc
@@ -77,7 +77,7 @@ Handle<Value> ByteBufferToBuffer(grpc_byte_buffer *buffer) {
     memcpy(result + offset, GPR_SLICE_START_PTR(next), GPR_SLICE_LENGTH(next));
     offset += GPR_SLICE_LENGTH(next);
   }
-  return NanEscapeScope(MakeFastBuffer(NanNewBufferHandle(result, length)));
+  return NanEscapeScope(MakeFastBuffer(NanBufferUse(result, length)));
 }
 
 Handle<Value> MakeFastBuffer(Handle<Value> slowBuffer) {
diff --git a/ext/call.cc b/ext/call.cc
index 560869e6..49b30620 100644
--- a/ext/call.cc
+++ b/ext/call.cc
@@ -172,6 +172,9 @@ Handle<Value> Op::GetOpType() const {
   return NanEscapeScope(NanNew<String>(GetTypeString()));
 }
 
+Op::~Op() {
+}
+
 class SendMetadataOp : public Op {
  public:
   Handle<Value> GetNodeValue() const {
@@ -325,7 +328,7 @@ class ReadMessageOp : public Op {
   }
   ~ReadMessageOp() {
     if (recv_message != NULL) {
-      gpr_free(recv_message);
+      grpc_byte_buffer_destroy(recv_message);
     }
   }
   Handle<Value> GetNodeValue() const {
diff --git a/ext/call.h b/ext/call.h
index 89f81dcf..a01f0348 100644
--- a/ext/call.h
+++ b/ext/call.h
@@ -88,6 +88,7 @@ struct Resources {
 
 class Op {
  public:
+  virtual ~Op();
   virtual v8::Handle<v8::Value> GetNodeValue() const = 0;
   virtual bool ParseOp(v8::Handle<v8::Value> value, grpc_op *out,
                        shared_ptr<Resources> resources) = 0;
@@ -98,7 +99,6 @@ class Op {
 };
 
 typedef std::vector<unique_ptr<Op>> OpVec;
-
 struct tag {
   tag(NanCallback *callback, OpVec *ops,
       shared_ptr<Resources> resources);