diff --git a/src/analysis.zig b/src/analysis.zig
index 3b06d83..bd41247 100644
--- a/src/analysis.zig
+++ b/src/analysis.zig
@@ -832,7 +832,7 @@ pub fn resolveTypeOfNodeInternal(
             .type = .{ .data = .{ .other = node }, .is_type_val = false },
             .handle = handle,
         },
-        else => std.debug.warn("Type resolution case not implemented; {}\n", .{node.id}),
+        else => {}, //std.debug.warn("Type resolution case not implemented; {}\n", .{node.id}),
     }
     return null;
 }
@@ -1514,16 +1514,29 @@ pub fn iterateSymbolsContainer(
     orig_handle: *DocumentStore.Handle,
     comptime callback: var,
     context: var,
-    include_fields: bool,
+    instance_access: bool,
 ) error{OutOfMemory}!void {
     const container = container_handle.node;
     const handle = container_handle.handle;
 
+    const is_enum = if (container.cast(ast.Node.ContainerDecl)) |cont_decl|
+        handle.tree.token_ids[cont_decl.kind_token] == .Keyword_enum
+    else
+        false;
+
     if (findContainerScope(container_handle)) |container_scope| {
         var decl_it = container_scope.decls.iterator();
         while (decl_it.next()) |entry| {
-            if (!include_fields and entry.value == .ast_node and entry.value.ast_node.id == .ContainerField) continue;
-            if (entry.value == .label_decl) continue;
+            switch (entry.value) {
+                .ast_node => |node| {
+                    if (node.id == .ContainerField) {
+                        if (!instance_access and !is_enum) continue;
+                        if (instance_access and is_enum) continue;
+                    }
+                },
+                .label_decl => continue,
+                else => {},
+            }
             const decl = DeclWithHandle{ .decl = &entry.value, .handle = handle };
             if (handle != orig_handle and !decl.isPublic()) continue;
             try callback(context, decl);
@@ -1694,16 +1707,26 @@ pub fn lookupSymbolContainer(
     arena: *std.heap.ArenaAllocator,
     container_handle: NodeWithHandle,
     symbol: []const u8,
-    accept_fields: bool,
+    /// If true, we are looking up the symbol like we are accessing through a field access
+    /// of an instance of the type, otherwise as a field access of the type value itself.
+    instance_access: bool,
 ) error{OutOfMemory}!?DeclWithHandle {
     const container = container_handle.node;
     const handle = container_handle.handle;
 
+    const is_enum = if (container.cast(ast.Node.ContainerDecl)) |cont_decl|
+        handle.tree.token_ids[cont_decl.kind_token] == .Keyword_enum
+    else
+        false;
+
     if (findContainerScope(container_handle)) |container_scope| {
         if (container_scope.decls.get(symbol)) |candidate| {
             switch (candidate.value) {
                 .ast_node => |node| {
-                    if (node.id == .ContainerField and !accept_fields) return null;
+                    if (node.id == .ContainerField) {
+                        if (!instance_access and !is_enum) return null;
+                        if (instance_access and is_enum) return null;
+                    }
                 },
                 .label_decl => unreachable,
                 else => {},
@@ -1715,7 +1738,7 @@ pub fn lookupSymbolContainer(
         return null;
     }
 
-    std.debug.warn("Did not find container scope when looking up in container {} (name: {})\n", .{ container, getDeclName(handle.tree, container) });
+    // std.debug.warn("Did not find container scope when looking up in container {} (name: {})\n", .{ container, getDeclName(handle.tree, container) });
     return null;
 }
 
diff --git a/src/document_store.zig b/src/document_store.zig
index 88d7058..6a2742e 100644
--- a/src/document_store.zig
+++ b/src/document_store.zig
@@ -552,7 +552,7 @@ pub fn resolveImport(self: *DocumentStore, handle: *Handle, import_str: []const
         import_str,
     )) orelse return null;
 
-    std.debug.warn("Import final URI: {}\n", .{final_uri});
+    // std.debug.warn("Import final URI: {}\n", .{final_uri});
     var consumed_final_uri = false;
     defer if (!consumed_final_uri) allocator.free(final_uri);
 
diff --git a/src/semantic_tokens.zig b/src/semantic_tokens.zig
index 2cb2a72..27201b3 100644
--- a/src/semantic_tokens.zig
+++ b/src/semantic_tokens.zig
@@ -492,6 +492,8 @@ fn writeNodeTokens(builder: *Builder, arena: *std.heap.ArenaAllocator, store: *D
 
                                     if (tok_type) |tt| try writeToken(builder, infix_op.rhs.firstToken(), tt);
                                     return;
+                                } else if (decl_node.id == .ErrorTag) {
+                                    try writeToken(builder, infix_op.rhs.firstToken(), .errorTag);
                                 }
                             },
                             else => {},