diff --git a/Projects/SAMufasaGUI/framescript.pas b/Projects/SAMufasaGUI/framescript.pas
index 249797d..760a246 100644
--- a/Projects/SAMufasaGUI/framescript.pas
+++ b/Projects/SAMufasaGUI/framescript.pas
@@ -292,6 +292,7 @@ begin
         Synedit.MarkupByClass[TSynEditMarkupHighlightAllCaret].TempDisable;
       end;}
     mp := TCodeInsight.Create;
+    mp.FileName := ScriptFile;
     {$IFDEF ciDEBUG}
     mp.OnMessage := @Form1.OnCCMessage;
     {$ENDIF}
diff --git a/Projects/SAMufasaGUI/testunit.pas b/Projects/SAMufasaGUI/testunit.pas
index 84baa91..e57613d 100644
--- a/Projects/SAMufasaGUI/testunit.pas
+++ b/Projects/SAMufasaGUI/testunit.pas
@@ -475,11 +475,7 @@ function TForm1.OnCCFindInclude(Sender: TObject; var FileName: string): Boolean;
 var
   Temp : string;
 begin
-  Temp := ExtractFileDir(CurrTab.ScriptFrame.ScriptFile);
-  if (Temp <> '') then
-    Temp := Temp + DS;
-
-  Temp := FindFile(filename,[MainDir+DS,IncludePath, Temp]);
+  Temp := FindFile(filename,[MainDir+DS,IncludePath]);
   if temp <> '' then
   begin;
     filename := temp;
diff --git a/Units/Misc/v_autocompleteform.pas b/Units/Misc/v_autocompleteform.pas
index a58de24..7f003a4 100644
--- a/Units/Misc/v_autocompleteform.pas
+++ b/Units/Misc/v_autocompleteform.pas
@@ -34,7 +34,7 @@ type
     {$IFDEF ccFORMCAPTION}
     procedure DoSelectionChange(User: Boolean); override;
     {$ENDIF}
-    procedure DrawItem(Index: Integer; ARect: TRect; State: TOwnerDrawState); override;
+    procedure DrawItem(Control: TWinControl; Index: Integer; ARect: TRect; State: TOwnerDrawState);
     {$IFDEF FPC}
     procedure WMEraseBkgnd(var message: TLMEraseBkgnd); message LM_ERASEBKGND;
     procedure WMVScroll(var message: TLMVScroll); message LM_VSCROLL;
@@ -300,7 +300,7 @@ begin
 end;
 {$ENDIF}
 
-procedure TAutoCompleteListBox.DrawItem(Index: Integer; ARect: TRect; State: TOwnerDrawState);
+procedure TAutoCompleteListBox.DrawItem(Control: TWinControl; Index: Integer; ARect: TRect; State: TOwnerDrawState);
 var
   p1, p2, p3, tl, col: Integer;
   s, c: string;
@@ -398,6 +398,7 @@ begin
   ControlStyle := ControlStyle + [csOpaque];
   BorderStyle := bsNone;
   Style := lbOwnerDrawFixed;
+  OnDrawItem := {$IFDEF FPC}@{$ENDIF}DrawItem;
 
   IntegralHeight := True;
   {$IFDEF FPC}