diff --git a/src/ce_dfmt.pas b/src/ce_dfmt.pas
index f0cad88a..dc8c5c61 100644
--- a/src/ce_dfmt.pas
+++ b/src/ce_dfmt.pas
@@ -289,5 +289,7 @@ begin
 end;
 {$ENDREGION}
 
+initialization
+  RegisterClasses([TCEDmtWrapper]);
 end.
 
diff --git a/src/ce_editoroptions.pas b/src/ce_editoroptions.pas
index 74798bed..1d1dd083 100644
--- a/src/ce_editoroptions.pas
+++ b/src/ce_editoroptions.pas
@@ -653,6 +653,7 @@ end;
 {$ENDREGION}
 
 initialization
+  RegisterClasses([TCEEditorOptionsBase, TCEEditorOptions]);
   EditorOptions := TCEEditorOptions.Create(nil);
 
 finalization
diff --git a/src/ce_main.pas b/src/ce_main.pas
index d34a562c..7e11cdb0 100644
--- a/src/ce_main.pas
+++ b/src/ce_main.pas
@@ -1966,7 +1966,7 @@ begin
       sysutils.DeleteFile(fname + objExt);
     end
     else begin
-      fMsgs.message(shortenPath(fDoc.fileName,25) + ' has not been compiled',
+      fMsgs.message(shortenPath(fDoc.fileName, 25) + ' has not been compiled',
         fDoc, amcEdit, amkErr);
     end;
 
@@ -2372,5 +2372,5 @@ end;
 
 initialization
   registerClasses([TCEPersistentMainShortcuts, TCEPersistentMainMrus,
-    TCELastDocsAndProjs]);
+    TCELastDocsAndProjs, TCEApplicationOptionsBase, TCEApplicationOptions]);
 end.
diff --git a/src/ce_miniexplorer.pas b/src/ce_miniexplorer.pas
index e0159a0c..f06221c4 100644
--- a/src/ce_miniexplorer.pas
+++ b/src/ce_miniexplorer.pas
@@ -696,4 +696,6 @@ begin
 end;
 {$ENDREGION}
 
+initialization
+  RegisterClasses([TCEMiniExplorerOptions]);
 end.
diff --git a/src/ce_search.pas b/src/ce_search.pas
index 2eb2fe6a..26870b64 100644
--- a/src/ce_search.pas
+++ b/src/ce_search.pas
@@ -567,4 +567,6 @@ begin
 end;
 {$ENDREGION}
 
+initialization
+  RegisterClasses([TCESearchOptions]);
 end.
diff --git a/src/ce_shortcutseditor.pas b/src/ce_shortcutseditor.pas
index 9e53860d..ed3ab512 100644
--- a/src/ce_shortcutseditor.pas
+++ b/src/ce_shortcutseditor.pas
@@ -431,6 +431,7 @@ end;
 {$ENDREGION}
 
 initialization
+  RegisterClasses([TShortcutItem, TShortCutCollection]);
   CEShortcutEditor := TCEShortcutEditor.Create(nil);
 finalization
   CEShortcutEditor.Free;
diff --git a/src/ce_staticmacro.pas b/src/ce_staticmacro.pas
index 3d94d2af..620384f7 100644
--- a/src/ce_staticmacro.pas
+++ b/src/ce_staticmacro.pas
@@ -404,6 +404,7 @@ end;
 {$ENDREGION}
 
 initialization
+  RegisterClasses([TStaticMacrosOptions]);
   StaticEditorMacro := TCEStaticEditorMacro.create(nil);
 finalization
   StaticEditorMacro.Free;;
diff --git a/src/ce_symlist.pas b/src/ce_symlist.pas
index 5ce71a63..8630bf9f 100644
--- a/src/ce_symlist.pas
+++ b/src/ce_symlist.pas
@@ -822,4 +822,6 @@ begin
 end;
 {$ENDREGION --------------------------------------------------------------------}
 
+initialization
+  RegisterClasses([TCESymbolListOptions]);
 end.
diff --git a/src/ce_synmemo.pas b/src/ce_synmemo.pas
index c0cb87b4..5b62cb25 100644
--- a/src/ce_synmemo.pas
+++ b/src/ce_synmemo.pas
@@ -1433,6 +1433,7 @@ initialization
   TCEEditorHintWindow.FontSize := 10;
   //
   RegisterKeyCmdIdentProcs(@CustomStringToCommand, @CustomCommandToSstring);
+  RegisterClasses([TCESynMemoCache, TCEFoldCache]);
 finalization
   D2Syn.Free;
   LfmSyn.Free;
diff --git a/src/ce_todolist.pas b/src/ce_todolist.pas
index 8b45e1bc..1c2c9bda 100644
--- a/src/ce_todolist.pas
+++ b/src/ce_todolist.pas
@@ -196,7 +196,6 @@ begin
     fItems.Clear;
   end;
 end;
-
 {$ENDREGIOn}
 
 {$REGION Standard Comp/Obj -----------------------------------------------------}
@@ -336,7 +335,6 @@ begin
   if Visible and fAutoRefresh then
     callToolProcess;
 end;
-
 {$ENDREGION}
 
 {$REGION ICEProjectObserver ----------------------------------------------------}
@@ -648,4 +646,6 @@ begin
 end;
 {$ENDREGION}
 
+initialization
+  RegisterClasses([TCETodoOptions]);
 end.