diff --git a/Source/forms/simba.functionlistform.pas b/Source/forms/simba.functionlistform.pas
index 6ecaf6847..558860605 100644
--- a/Source/forms/simba.functionlistform.pas
+++ b/Source/forms/simba.functionlistform.pas
@@ -103,12 +103,24 @@ function GetText(const Decl: TDeclaration): String;
 begin
   if (Decl is TDeclaration_Method) and Decl.isObjectMethod then
     Result := TDeclaration_Method(Decl).ObjectName + '.' + TDeclaration_Method(Decl).Name
+  else
+  if (Decl is TDeclaration_EnumElement) then
+    if (Decl.Owner is TDeclaration_TypeEnumScoped) then
+      Result := Decl.Owner.Name + '.' + Decl.Name
+    else
+      Result := Decl.Name
   else
     Result := Decl.Name;
 end;
 
 function GetHint(const Decl: TDeclaration): String;
 begin
+  if (Decl is TDeclaration_EnumElement) then
+    if (Decl.Owner is TDeclaration_TypeEnumScoped) then
+      Result := Decl.Owner.Name + '.' + Decl.Name
+    else
+      Result := Decl.Name
+  else
   if (Decl is TDeclaration_Method) then Result := TDeclaration_Method(Decl).HeaderString                                                                  else
   if (Decl is TDeclaration_Type)   then Result := 'type '    + Decl.Name + ' = ' + Decl.TextNoCommentsSingleLine                                          else
   if (Decl is TDeclaration_Const)  then Result := 'const '   + Decl.Name + TDeclaration_Var(Decl).VarTypeString + TDeclaration_Var(Decl).VarDefaultString else
diff --git a/Source/script/simba.compiler_dump.pas b/Source/script/simba.compiler_dump.pas
index aa73e90f3..cc8fd7023 100644
--- a/Source/script/simba.compiler_dump.pas
+++ b/Source/script/simba.compiler_dump.pas
@@ -303,9 +303,7 @@ procedure TSimbaCompilerDump.DumpToFile(FileName: String);
   Add('System', 'function IndexOf(const Item: T; const A: array): Integer; external;');
   Add('System', 'function IndicesOf(const Item: T; const A: array): TIntegerArray; external;');
   Add('System', 'function Contains(const Item: T; const A: array): Boolean; external;');
-
   Add('System', 'function RTTIFields(constref AnyRecord): TRTTIFields; external;');
-  Add('System', 'function RTTIClassFields(constref AnyRecord): TRTTIFields; external;');
 
   Add('System', 'function GetCallerAddress: Pointer; external;');
   Add('System', 'function GetCallerName: String; external;');