diff --git a/composer.json b/composer.json
index 6e7f24b451eb5d7fc6ab91bff378d7e23eef7ac7..05ac0037146fae19f0631a63c0d7a7102a5636a2 100644
--- a/composer.json
+++ b/composer.json
@@ -13,10 +13,8 @@
   ],
   "require": {
     "php": ">=5.5.0",
-    "datto/protobuf-php": "dev-master"
-  },
-  "require-dev": {
-    "google/auth": "v0.9"
+    "datto/protobuf-php": "dev-master",
+    "google/auth": "v0.7"
   },
   "autoload": {
     "psr-4": {
diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.c b/src/core/ext/transport/chttp2/transport/chttp2_transport.c
index 28f27c271decb95f4a533e87781f34544ebdf7c1..91ca2683e0344830d62be4603f27a1e641174e83 100644
--- a/src/core/ext/transport/chttp2/transport/chttp2_transport.c
+++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.c
@@ -31,9 +31,6 @@
  *
  */
 
-// TODO(ctiller): schedule check_read_ops whenever something is added to that
-// list
-
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 
 #include <math.h>
@@ -1816,7 +1813,8 @@ static void reading_action_locked(grpc_exec_ctx *exec_ctx, void *tp,
     grpc_chttp2_stream_map_move_into(&t->new_stream_map,
                                      &t->parsing_stream_map);
     grpc_chttp2_prepare_to_read(transport_global, transport_parsing);
-    grpc_exec_ctx_sched(exec_ctx, &t->parsing_action, error, NULL);
+    grpc_exec_ctx_sched(exec_ctx, &t->parsing_action, GRPC_ERROR_REF(error),
+                        NULL);
   } else {
     post_reading_action_locked(exec_ctx, t, GRPC_ERROR_REF(error));
   }
diff --git a/src/core/lib/iomgr/workqueue_posix.c b/src/core/lib/iomgr/workqueue_posix.c
index 5accd067445baec6a0919ee5540c91af89d760a5..160f88bdee72968e13e2c5a5c48a50e7718fe3ff 100644
--- a/src/core/lib/iomgr/workqueue_posix.c
+++ b/src/core/lib/iomgr/workqueue_posix.c
@@ -90,6 +90,7 @@ void grpc_workqueue_ref(grpc_workqueue *workqueue, const char *file, int line,
 }
 #else
 void grpc_workqueue_ref(grpc_workqueue *workqueue) {
+  if (workqueue == NULL) return;
   gpr_ref(&workqueue->refs);
 }
 #endif
@@ -106,6 +107,7 @@ void grpc_workqueue_unref(grpc_exec_ctx *exec_ctx, grpc_workqueue *workqueue,
 }
 #else
 void grpc_workqueue_unref(grpc_exec_ctx *exec_ctx, grpc_workqueue *workqueue) {
+  if (workqueue == NULL) return;
   if (gpr_unref(&workqueue->refs)) {
     workqueue_orphan(exec_ctx, workqueue);
   }