diff --git a/packages/ddp-server/livedata_server.js b/packages/ddp-server/livedata_server.js
index c6f4216d81..51a794f505 100644
--- a/packages/ddp-server/livedata_server.js
+++ b/packages/ddp-server/livedata_server.js
@@ -809,14 +809,14 @@ Object.assign(Session.prototype, {
       };
 
       promise.then(result => {
-        finish().then(() => {
+        finish().finally(() => {
           if (result !== undefined) {
             payload.result = result;
           }
           self.send(payload);
         });
       }, (exception) => {
-        finish().then(() => {
+        finish().finally(() => {
           payload.error = wrapInternalException(
             exception,
             `while invoking method '${msg.method}'`
diff --git a/packages/mongo/polling_observe_driver.js b/packages/mongo/polling_observe_driver.js
index c60cb05a07..e64779d56b 100644
--- a/packages/mongo/polling_observe_driver.js
+++ b/packages/mongo/polling_observe_driver.js
@@ -90,8 +90,8 @@ _.extend(PollingObserveDriver.prototype, {
     if (self._pollsScheduledButNotStarted > 0)
       return;
     ++self._pollsScheduledButNotStarted;
-    //TODO check this change
-    await self._taskQueue.runTask(async function () {
+    //TODO[fibers] check this change
+    await self._taskQueue.queueTask(async function () {
       await self._pollMongo();
     });
   },