diff --git a/src/Grid.zig b/src/Grid.zig
index daaa2e930..75b3e37ae 100644
--- a/src/Grid.zig
+++ b/src/Grid.zig
@@ -366,7 +366,7 @@ pub fn rebuildCells(self: *Grid, term: *Terminal) !void {
             for (try shaper.shape(run)) |shaper_cell| {
                 assert(try self.updateCell(
                     term,
-                    row[shaper_cell.x],
+                    row.getCell(shaper_cell.x),
                     shaper_cell,
                     run,
                     shaper_cell.x,
diff --git a/src/font/Shaper.zig b/src/font/Shaper.zig
index 8f809f1a5..05037f2d5 100644
--- a/src/font/Shaper.zig
+++ b/src/font/Shaper.zig
@@ -248,8 +248,8 @@ test "run iterator" {
     // Spaces should be part of a run
     {
         var screen = try terminal.Screen.init(alloc, 3, 10, 0);
-        defer screen.deinit(alloc);
-        screen.testWriteString("ABCD   EFG");
+        defer screen.deinit();
+        try screen.testWriteString("ABCD   EFG");
 
         var shaper = testdata.shaper;
         var it = shaper.runIterator(screen.getRow(.{ .screen = 0 }));
@@ -317,8 +317,8 @@ test "shape inconsolata ligs" {
 
     {
         var screen = try terminal.Screen.init(alloc, 3, 5, 0);
-        defer screen.deinit(alloc);
-        screen.testWriteString(">=");
+        defer screen.deinit();
+        try screen.testWriteString(">=");
 
         var shaper = testdata.shaper;
         var it = shaper.runIterator(screen.getRow(.{ .screen = 0 }));
@@ -335,8 +335,8 @@ test "shape inconsolata ligs" {
 
     {
         var screen = try terminal.Screen.init(alloc, 3, 5, 0);
-        defer screen.deinit(alloc);
-        screen.testWriteString("===");
+        defer screen.deinit();
+        try screen.testWriteString("===");
 
         var shaper = testdata.shaper;
         var it = shaper.runIterator(screen.getRow(.{ .screen = 0 }));
@@ -361,8 +361,8 @@ test "shape emoji width" {
 
     {
         var screen = try terminal.Screen.init(alloc, 3, 5, 0);
-        defer screen.deinit(alloc);
-        screen.testWriteString("👍");
+        defer screen.deinit();
+        try screen.testWriteString("👍");
 
         var shaper = testdata.shaper;
         var it = shaper.runIterator(screen.getRow(.{ .screen = 0 }));