diff --git a/src/tty.zig b/src/tty.zig
index fa85446d..243933e6 100644
--- a/src/tty.zig
+++ b/src/tty.zig
@@ -59,7 +59,7 @@ pub const PosixTty = struct {
             .handler = .{ .handler = PosixTty.handleWinch },
             .mask = switch (builtin.os.tag) {
                 .macos => 0,
-                else => posix.empty_sigset,
+                else => posix.sigemptyset(),
             },
             .flags = 0,
         };
@@ -93,7 +93,7 @@ pub const PosixTty = struct {
             .handler = .{ .handler = posix.SIG.DFL },
             .mask = switch (builtin.os.tag) {
                 .macos => 0,
-                else => posix.empty_sigset,
+                else => posix.sigemptyset(),
             },
             .flags = 0,
         };
diff --git a/src/vxfw/vxfw.zig b/src/vxfw/vxfw.zig
index 3b1e4c0c..ea418738 100644
--- a/src/vxfw/vxfw.zig
+++ b/src/vxfw/vxfw.zig
@@ -550,7 +550,7 @@ test "All widgets have a doctest and refAllDecls test" {
             file.name[0..idx]
         else
             continue;
-        const data = try cwd.readFileAllocOptions(std.testing.allocator, file.name, 10_000_000, null, @alignOf(u8), 0x00);
+        const data = try cwd.readFileAllocOptions(std.testing.allocator, file.name, 10_000_000, null, .of(u8), 0x00);
         defer std.testing.allocator.free(data);
         var ast = try std.zig.Ast.parse(std.testing.allocator, data, .zig);
         defer ast.deinit(std.testing.allocator);
@@ -558,10 +558,11 @@ test "All widgets have a doctest and refAllDecls test" {
         var has_doctest: bool = false;
         var has_refAllDecls: bool = false;
         for (ast.rootDecls()) |root_decl| {
-            const decl = ast.nodes.get(root_decl);
+            const decl = ast.nodes.get(@intFromEnum(root_decl));
             switch (decl.tag) {
                 .test_decl => {
-                    const test_name = ast.tokenSlice(decl.data.lhs);
+                    const opt_token, _ = decl.data.opt_token_and_node;
+                    const test_name = ast.tokenSlice(opt_token.unwrap() orelse continue);
                     if (std.mem.eql(u8, "\"refAllDecls\"", test_name))
                         has_refAllDecls = true
                     else if (std.mem.eql(u8, container_name, test_name))