diff --git a/src/ce_dmdwrap.pas b/src/ce_dmdwrap.pas
index 9a0cea17..79b32098 100644
--- a/src/ce_dmdwrap.pas
+++ b/src/ce_dmdwrap.pas
@@ -225,8 +225,8 @@ type
     property Sources: TStringList read fExtraSrcs write setSrcs stored false; deprecated;
     property exclusions: TStringList read fExcl write setExcl;
     property extraSources: TStringList read fExtraSrcs write setSrcs;
-    property includes: TStringList read fIncl write setIncl; deprecated;
-    property imports: TStringList read fImpt write setImpt; deprecated;
+    property includes: TStringList read fIncl write setIncl stored false; deprecated;
+    property imports: TStringList read fImpt write setImpt stored false; deprecated;
     property importModulePaths: TStringList read fIncl write setIncl;
     property importStringPaths: TStringList read fImpt write setImpt;
   public
diff --git a/src/ce_editor.pas b/src/ce_editor.pas
index 4907f184..32aa4e75 100644
--- a/src/ce_editor.pas
+++ b/src/ce_editor.pas
@@ -234,6 +234,7 @@ begin
   macRecorder.Editor := fDoc;
   fSyncEdit.Editor := fDoc;
   completion.Editor := fDoc;
+  //TODO-cbugfix: prevent completion to steal the focus, this trigs too much updates after Ctrl+Space
   if (pageControl.ActivePage.Caption = '') then
   begin
     fKeyChanged := true;
@@ -249,6 +250,7 @@ end;
 procedure TCEEditorWidget.completionExecute(Sender: TObject);
 begin
   getCompletionList;
+  completion.TheForm.Font.Size := fDoc.Font.Size;
 end;
 
 procedure TCEEditorWidget.completionCodeCompletion(var Value: string;
diff --git a/src/ce_libmaneditor.pas b/src/ce_libmaneditor.pas
index 38febf3b..f7c875d0 100644
--- a/src/ce_libmaneditor.pas
+++ b/src/ce_libmaneditor.pas
@@ -110,7 +110,7 @@ end;
 procedure TCELibManEditorWidget.btnRemLibClick(Sender: TObject);
 begin
   if List.Selected = nil then exit;
-  List.Items.Delete( List.Selected.Index );
+  List.Items.Delete(List.Selected.Index);
   gridToData;
 end;