diff --git a/src/render/render.spec.ts b/src/render/render.spec.ts
index 111db9ebf..bde327945 100644
--- a/src/render/render.spec.ts
+++ b/src/render/render.spec.ts
@@ -2,6 +2,7 @@ import { Context } from '../context'
 import { HTMLToken, TagToken } from '../tokens'
 import { Render } from './render'
 import { Tag, HTML } from '../template'
+import { SimpleEmitter } from '../emitters'
 import { toPromise } from '../util'
 
 describe('render', function () {
@@ -14,7 +15,7 @@ describe('render', function () {
     it('should render html', async function () {
       const scope = new Context()
       const token = { getContent: () => '<p>' } as HTMLToken
-      const html = await toPromise(render.renderTemplates([new HTML(token)], scope))
+      const html = await toPromise(render.renderTemplates([new HTML(token)], scope, new SimpleEmitter()))
       return expect(html).toBe('<p>')
     })
   })
diff --git a/src/tags/for.ts b/src/tags/for.ts
index bb05dcdb3..ec964ac6a 100644
--- a/src/tags/for.ts
+++ b/src/tags/for.ts
@@ -41,7 +41,7 @@ export default class extends Tag {
 
     stream.start()
   }
-  * render (ctx: Context, emitter: Emitter): Generator<unknown, unknown, unknown> {
+  * render (ctx: Context, emitter: Emitter): Generator<unknown, void | string, Template[]> {
     const r = this.liquid.renderer
     const continueKey = 'continue-' + this.variable + '-' + this.collection.getText()
     ctx.push(createScope({ continue: ctx.getRegister(continueKey, {}) }))
diff --git a/src/tags/tablerow.ts b/src/tags/tablerow.ts
index c63dba179..563b44392 100644
--- a/src/tags/tablerow.ts
+++ b/src/tags/tablerow.ts
@@ -39,10 +39,9 @@ export default class extends Tag {
   }
 
   * render (ctx: Context, emitter: Emitter): Generator<unknown, void, unknown> {
+    let collection = toEnumerable(yield evalToken(this.collection, ctx))
     const args = (yield this.args.render(ctx)) as Record<string, any>
     const offset = args.offset || 0
-
-    let collection = toEnumerable(yield evalToken(this.collection, ctx))
     const limit = (args.limit === undefined) ? collection.length : args.limit
 
     collection = collection.slice(offset, offset + limit)