diff --git a/bench/TextBench.cpp b/bench/TextBench.cpp
index 0bef92c..9334c33 100644
--- a/bench/TextBench.cpp
+++ b/bench/TextBench.cpp
@@ -49,6 +49,7 @@
 public:
     TextBench(void* param, const char text[], int ps,
               SkColor color, FontQuality fq, bool doPos = false) : INHERITED(param) {
+        fPos = NULL;
         fFQ = fq;
         fDoPos = doPos;
         fText.set(text);
diff --git a/bench/benchmain.cpp b/bench/benchmain.cpp
index 0ea48e9..73aa988 100644
--- a/bench/benchmain.cpp
+++ b/bench/benchmain.cpp
@@ -374,6 +374,7 @@
         if (*contextHeight < dim.fY) {
             *contextHeight = dim.fY;
         }
+        bench->unref();
     }
 }
 
@@ -737,6 +738,8 @@
     Iter iter(&defineDict);
     SkBenchmark* bench;
     while ((bench = iter.next()) != NULL) {
+        SkAutoTUnref<SkBenchmark> benchUnref(bench);
+
         SkIPoint dim = bench->getSize();
         if (dim.fX <= 0 || dim.fY <= 0) {
             continue;