diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/AssignmentInfo.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/AssignmentInfo.java
index 753adb86e..dd7c15f44 100644
--- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/AssignmentInfo.java
+++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/AssignmentInfo.java
@@ -238,7 +238,7 @@ public class AssignmentInfo {
      * Check if the given global position falls within the LHS (target) of this assignment.
      */
     public boolean containsLhsPosition(int position) {
-        return position >= lhsStart && position < lhsEnd;
+        return position >= statementStart && position < lhsEnd;
     }
 
     /**
@@ -252,7 +252,7 @@ public class AssignmentInfo {
      * Check if the given global position falls anywhere in this assignment (LHS or RHS).
      */
     public boolean containsPosition(int position) {
-        return position >= lhsStart && position <= rhsEnd;
+        return position >= statementStart && position <= rhsEnd;
     }
 
     // ==================== ERROR TYPE CHECKS ====================
diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/hover/TokenHoverInfo.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/hover/TokenHoverInfo.java
index a55386641..dc275cfaf 100644
--- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/hover/TokenHoverInfo.java
+++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/hover/TokenHoverInfo.java
@@ -127,16 +127,13 @@ public class TokenHoverInfo {
                 break;
                 
             case LITERAL:
-                if (info.hasErrors()) 
-                    return info;
-                return null;
             case KEYWORD:
             case MODIFIER:
             case STRING:
             case COMMENT:
-                // These don't need hover info typically
+                if (info.hasErrors())
+                    return info;
                 return null;
-                
             default:
                 // For other types, try to extract any available metadata
                 if (token.getTypeInfo() != null) {