diff --git a/components/codetools/laz_xmlcfg.pas b/components/codetools/laz_xmlcfg.pas
index 0ac753321f..3821cac5ea 100644
--- a/components/codetools/laz_xmlcfg.pas
+++ b/components/codetools/laz_xmlcfg.pas
@@ -100,15 +100,18 @@ uses SysUtils;
 
 constructor TXMLConfig.Create(const AFilename: String);
 begin
+  //DebugLn(['TXMLConfig.Create ',AFilename]);
   inherited Create(nil);
   SetFilename(AFilename);
 end;
 
 constructor TXMLConfig.CreateClean(const AFilename: String);
 begin
+  //DebugLn(['TXMLConfig.CreateClean ',AFilename]);
   inherited Create(nil);
   fDoNotLoad:=true;
   SetFilename(AFilename);
+  FModified:=FileExistsCached(AFilename);
 end;
 
 destructor TXMLConfig.Destroy;
diff --git a/components/education/eduenvoptsframe.pas b/components/education/eduenvoptsframe.pas
index c00e4638b3..dcc339a65e 100644
--- a/components/education/eduenvoptsframe.pas
+++ b/components/education/eduenvoptsframe.pas
@@ -93,14 +93,11 @@ end;
 
 procedure TEduEnvFrame.ReadSettings(AOptions: TAbstractIDEOptions);
 begin
-  debugln(['TEduEnvFrame.ReadSettings ',EduGeneralOptions.Enabled]);
   EnableCheckBox.Checked:=EduGeneralOptions.Enabled;
-  DebugLn(['TEduEnvFrame.ReadSettings ',EnableCheckBox.Checked,' ',EduGeneralOptions.Enabled]);
 end;
 
 procedure TEduEnvFrame.WriteSettings(AOptions: TAbstractIDEOptions);
 begin
-  debugln(['TEduEnvFrame.WriteSettings ',EnableCheckBox.Checked]);
   EduGeneralOptions.Enabled:=EnableCheckBox.Checked;
   if EducationOptions.Save<>mrOk then
     DebugLn(['TEduEnvFrame.WriteSettings Failed']);
diff --git a/ide/frames/codetools_linesplitting_options.pas b/ide/frames/codetools_linesplitting_options.pas
index 9c4498b448..880ebfc54c 100644
--- a/ide/frames/codetools_linesplitting_options.pas
+++ b/ide/frames/codetools_linesplitting_options.pas
@@ -89,18 +89,14 @@ procedure TCodetoolsLineSplittingOptionsFrame.UpdatePreviewSettings;
 var
   Options: TEditorOptions;
 begin
-  Options := TEditorOptions.Create;
-  try
-    if Assigned(OnSaveIDEOptions) then
-      OnSaveIDEOptions(Self, Options);
-    SplitPreviewSynEdit.Highlighter := GetHighlighter(Options);
-    Options.GetSynEditPreviewSettings(SplitPreviewSynEdit);
-    SplitPreviewSynEdit.Gutter.Visible := False;
-    SplitPreviewSynEdit.Options := SplitPreviewSynEdit.Options + [eoNoCaret, eoNoSelection];
-    SplitPreviewSynEdit.ReadOnly := True;
-  finally
-    Options.Free;
-  end;
+  Options := EditorOpts;
+  if Assigned(OnSaveIDEOptions) then
+    OnSaveIDEOptions(Self, Options);
+  SplitPreviewSynEdit.Highlighter := GetHighlighter(Options);
+  Options.GetSynEditPreviewSettings(SplitPreviewSynEdit);
+  SplitPreviewSynEdit.Gutter.Visible := False;
+  SplitPreviewSynEdit.Options := SplitPreviewSynEdit.Options + [eoNoCaret, eoNoSelection];
+  SplitPreviewSynEdit.ReadOnly := True;
 end;
 
 procedure TCodetoolsLineSplittingOptionsFrame.WriteBeautifyCodeOptions(Options: TBeautifyCodeOptions);
diff --git a/ide/frames/codetools_space_options.pas b/ide/frames/codetools_space_options.pas
index c5da0e7c4e..ce3e7edb45 100644
--- a/ide/frames/codetools_space_options.pas
+++ b/ide/frames/codetools_space_options.pas
@@ -93,18 +93,14 @@ procedure TCodetoolsSpaceOptionsFrame.UpdatePreviewSettings;
 var
   Options: TEditorOptions;
 begin
-  Options := TEditorOptions.Create;
-  try
-    if Assigned(OnSaveIDEOptions) then
-      OnSaveIDEOptions(Self, Options);
-    SpacePreviewSynEdit.Highlighter := GetHighlighter(Options);
-    Options.GetSynEditPreviewSettings(SpacePreviewSynEdit);
-    SpacePreviewSynEdit.Gutter.Visible := False;
-    SpacePreviewSynEdit.Options := SpacePreviewSynEdit.Options + [eoNoCaret, eoNoSelection];
-    SpacePreviewSynEdit.ReadOnly := True;
-  finally
-    Options.Free;
-  end;
+  Options := EditorOpts;
+  if Assigned(OnSaveIDEOptions) then
+    OnSaveIDEOptions(Self, Options);
+  SpacePreviewSynEdit.Highlighter := GetHighlighter(Options);
+  Options.GetSynEditPreviewSettings(SpacePreviewSynEdit);
+  SpacePreviewSynEdit.Gutter.Visible := False;
+  SpacePreviewSynEdit.Options := SpacePreviewSynEdit.Options + [eoNoCaret, eoNoSelection];
+  SpacePreviewSynEdit.ReadOnly := True;
 end;
 
 procedure TCodetoolsSpaceOptionsFrame.WriteBeautifyCodeOptions(