diff --git a/Projects/SAMufasaGUI/debugimage.lrs b/Projects/SAMufasaGUI/debugimage.lrs
index fb31450..5a4a408 100644
--- a/Projects/SAMufasaGUI/debugimage.lrs
+++ b/Projects/SAMufasaGUI/debugimage.lrs
@@ -1,11 +1,11 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TDebugImgForm','FORMDATA',[
-  'TPF0'#13'TDebugImgForm'#12'DebugImgForm'#4'Left'#3#235#1#6'Height'#3','#1#3
-  +'Top'#3#10#1#5'Width'#3#144#1#11'BorderIcons'#11#12'biSystemMenu'#10'biMinim'
-  +'ize'#0#11'BorderStyle'#7#12'bsToolWindow'#7'Caption'#6#12'DebugImgForm'#12
-  +'ClientHeight'#3','#1#11'ClientWidth'#3#144#1#8'OnCreate'#7#10'FormCreate'#6
-  +'OnHide'#7#8'FormHide'#8'OnResize'#7#10'FormResize'#10'LCLVersion'#6#6'0.9.2'
-  +'9'#0#6'TImage'#9'DrawImage'#4'Left'#2#0#6'Height'#3','#1#3'Top'#2#0#5'Width'
-  +#3#144#1#5'Align'#7#8'alClient'#0#0#0
-]);
\ No newline at end of file
+{ This is an automatically generated lazarus resource file }
+
+LazarusResources.Add('TDebugImgForm','FORMDATA',[
+  'TPF0'#13'TDebugImgForm'#12'DebugImgForm'#4'Left'#3#235#1#6'Height'#3','#1#3
+  +'Top'#3#10#1#5'Width'#3#144#1#11'BorderIcons'#11#12'biSystemMenu'#10'biMinim'
+  +'ize'#0#11'BorderStyle'#7#12'bsToolWindow'#7'Caption'#6#12'DebugImgForm'#12
+  +'ClientHeight'#3','#1#11'ClientWidth'#3#144#1#8'OnCreate'#7#10'FormCreate'#6
+  +'OnHide'#7#8'FormHide'#8'OnResize'#7#10'FormResize'#10'LCLVersion'#6#6'0.9.2'
+  +'9'#0#6'TImage'#9'DrawImage'#4'Left'#2#0#6'Height'#3','#1#3'Top'#2#0#5'Width'
+  +#3#144#1#5'Align'#7#8'alClient'#0#0#0
+]);
diff --git a/Projects/SAMufasaGUI/testunit.pas b/Projects/SAMufasaGUI/testunit.pas
index 3bdf575..52494af 100644
--- a/Projects/SAMufasaGUI/testunit.pas
+++ b/Projects/SAMufasaGUI/testunit.pas
@@ -1687,8 +1687,9 @@ begin
     if not DeleteTab(i,true) then
     begin;
       CloseAction := caNone;
-      exit
+      exit;
     end;
+  FreeAndNil(ExtManager);
 end;
 
 procedure TForm1.FormCreate(Sender: TObject);
@@ -1758,6 +1759,8 @@ begin
     TMufasaTab(Tabs[i]).Free;
   for i := 0 to high(RecentFileItems) do
     RecentFileItems[i].Free;
+  if ExtManager <> nil then
+    ExtManager.free;
   Tabs.free;
   Selector.Free;
   Picker.Free;
@@ -1766,7 +1769,6 @@ begin
   SetLength(DebugStream, 0);
   RecentFiles.Free;
   DebugCriticalSection.Free;
-  ExtManager.free;
   {$ifdef MSWindows}
   if not UnRegisterHotkey(Self.Handle,0) then
     mDebugLn('Unable to unregister ctrl + alt + s as global hotkey');
diff --git a/Units/MMLAddon/mmlpsthread.pas b/Units/MMLAddon/mmlpsthread.pas
index 943db2d..e3e6a9a 100644
--- a/Units/MMLAddon/mmlpsthread.pas
+++ b/Units/MMLAddon/mmlpsthread.pas
@@ -275,6 +275,7 @@ end;
 {***implementation TMThread***}
 constructor TMThread.Create(CreateSuspended: boolean; TheSyncInfo: PSyncInfo; plugin_dir: string);
 begin
+  inherited Create(CreateSuspended);
   Client := TClient.Create(plugin_dir);
   MInternet := TMInternet.Create(Client);
   SyncInfo:= TheSyncInfo;
@@ -288,8 +289,6 @@ begin
   Sett := nil;
 
   Prop := TScriptProperties.Create;
-
-  inherited Create(CreateSuspended);
 end;
 
 destructor TMThread.Destroy;
@@ -298,7 +297,8 @@ begin
   Client.Free;
   Includes.free;
   Prop.Free;
-  Sett.Free;
+  if Sett <> nil then
+    Sett.Free;
   inherited Destroy;
 end;
 
@@ -514,6 +514,7 @@ constructor TPSThread.Create(CreateSuspended : boolean; TheSyncInfo : PSyncInfo;
 var
   I : integer;
 begin
+  inherited Create(CreateSuspended, TheSyncInfo, plugin_dir);
   PSScript := TPSScript.Create(nil);
   PSScript.UsePreProcessor:= True;
   PSScript.OnNeedFile := @RequireFile;
@@ -525,7 +526,6 @@ begin
   PSScript.OnFindUnknownFile:=@PSScriptFindUnknownFile;
   // Set some defines
   {$I PSInc/psdefines.inc}
-  inherited Create(CreateSuspended, TheSyncInfo, plugin_dir);
   for i := 0 to high(ExportedMethods) do
     if pos('Writeln',exportedmethods[i].FuncDecl) > 0 then
     begin
@@ -806,10 +806,10 @@ constructor TCPThread.Create(CreateSuspended: Boolean; TheSyncInfo : PSyncInfo;
 var
   plugin_idx: integer;
 begin
+  inherited Create(CreateSuspended, TheSyncInfo, plugin_dir);
   if libcpascal = 0 then
     LoadCPascal(plugin_dir);
   instance:= interp_init(@Interpreter_Precompiler, @Interpreter_ErrorHandler);
-  inherited Create(CreateSuspended, TheSyncInfo, plugin_dir);
 end;
 
 destructor TCPThread.Destroy;
diff --git a/Units/MMLAddon/settings.pas b/Units/MMLAddon/settings.pas
index 18055a2..50ff9cd 100644
--- a/Units/MMLAddon/settings.pas
+++ b/Units/MMLAddon/settings.pas
@@ -123,6 +123,7 @@ end;
 
 constructor TMMLSettings.Create(aNodes: TTreeNodes);
 begin
+  inherited Create;
   Self.Nodes := aNodes;
 end;
 
diff --git a/Units/MMLAddon/settingssandbox.pas b/Units/MMLAddon/settingssandbox.pas
index 55af658..4116225 100644
--- a/Units/MMLAddon/settingssandbox.pas
+++ b/Units/MMLAddon/settingssandbox.pas
@@ -56,6 +56,7 @@ implementation
 
 constructor TMMLSettingsSandbox.Create(sett: TMMLSettings);
 begin
+  inherited;
   Self.ST := sett;
 end;
 
diff --git a/Units/MMLCore/os_windows.pas b/Units/MMLCore/os_windows.pas
index f8a7801..a80f9ca 100644
--- a/Units/MMLCore/os_windows.pas
+++ b/Units/MMLCore/os_windows.pas
@@ -174,7 +174,10 @@ implementation
 
   constructor TWindow.Create(target: Hwnd);
   begin
-    self.create; //Call the other create
+    inherited Create;
+    self.buffer:= TBitmap.Create;
+    self.buffer.PixelFormat:= pf32bit;
+    keyinput:= TKeyInput.Create;
     self.handle:= target;
     self.dc:= GetWindowDC(target);
   end;