diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/EqualsHashCodeTemplatesManager.java b/java/java-impl/src/com/intellij/codeInsight/generation/EqualsHashCodeTemplatesManager.java
index 549f77cef1e1..5c4b59d3a53e 100644
--- a/java/java-impl/src/com/intellij/codeInsight/generation/EqualsHashCodeTemplatesManager.java
+++ b/java/java-impl/src/com/intellij/codeInsight/generation/EqualsHashCodeTemplatesManager.java
@@ -41,11 +41,8 @@ public class EqualsHashCodeTemplatesManager extends TemplatesManager {
     return ServiceManager.getService(EqualsHashCodeTemplatesManager.class);
   }
 
-  public EqualsHashCodeTemplatesManager() {
-    super(getDefaultTemplates());
-  }
-
-  private static TemplateResource[] getDefaultTemplates() {
+  @Override
+  public TemplateResource[] getDefaultTemplates() {
     try {
       return new TemplateResource[] {
         new TemplateResource("Default equals", readFile(DEFAULT_EQUALS), true),
diff --git a/platform/lang-impl/src/com/intellij/ui/StringComboboxEditor.java b/platform/lang-impl/src/com/intellij/ui/StringComboboxEditor.java
index 1d43ebb362a5..68afc2b26b6b 100644
--- a/platform/lang-impl/src/com/intellij/ui/StringComboboxEditor.java
+++ b/platform/lang-impl/src/com/intellij/ui/StringComboboxEditor.java
@@ -18,7 +18,6 @@ package com.intellij.ui;
 
 import com.intellij.openapi.application.Result;
 import com.intellij.openapi.command.WriteCommandAction;
-import com.intellij.openapi.command.undo.UndoConstants;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
@@ -58,7 +57,7 @@ public class StringComboboxEditor extends EditorComboBoxEditor {
     if (usePlainMatcher) {
       document.putUserData(USE_PLAIN_PREFIX_MATCHER, true);
     }
-    document.putUserData(UndoConstants.DONT_RECORD_UNDO, true);
+
     super.setItem(document);
   }
 
diff --git a/plugins/generate-tostring/src/org/jetbrains/java/generate/template/TemplatesManager.java b/plugins/generate-tostring/src/org/jetbrains/java/generate/template/TemplatesManager.java
index 026df3c0c9ba..d69e87d11f69 100644
--- a/plugins/generate-tostring/src/org/jetbrains/java/generate/template/TemplatesManager.java
+++ b/plugins/generate-tostring/src/org/jetbrains/java/generate/template/TemplatesManager.java
@@ -32,14 +32,9 @@ import java.util.*;
 
 public abstract class TemplatesManager implements PersistentStateComponent<TemplatesState> {
 
-    private TemplatesState myState = new TemplatesState();
-
-    public TemplatesManager(TemplateResource[] resources) {
-        for (TemplateResource o : resources) {
-            addTemplate(o);
-        }
-    }
+  private TemplatesState myState = new TemplatesState();
 
+  public abstract TemplateResource[] getDefaultTemplates();
   /**
    * Reads the content of the resource and return it as a String.
    * <p/>Uses the class loader that loaded this class to find the resource in its classpath.
@@ -77,7 +72,7 @@ public abstract class TemplatesManager implements PersistentStateComponent<Templ
 
   public Collection<TemplateResource> getAllTemplates() {
     HashSet<String> names = new HashSet<String>();
-    Collection<TemplateResource> templates = new LinkedHashSet<TemplateResource>();
+    Collection<TemplateResource> templates = new LinkedHashSet<TemplateResource>(Arrays.asList(getDefaultTemplates()));
     for (TemplateResource template : myState.templates) {
       if (names.add(template.getFileName())) {
         templates.add(template);
diff --git a/plugins/generate-tostring/src/org/jetbrains/java/generate/template/toString/ToStringTemplatesManager.java b/plugins/generate-tostring/src/org/jetbrains/java/generate/template/toString/ToStringTemplatesManager.java
index 96353f3a9d6b..af2c7e99aab1 100644
--- a/plugins/generate-tostring/src/org/jetbrains/java/generate/template/toString/ToStringTemplatesManager.java
+++ b/plugins/generate-tostring/src/org/jetbrains/java/generate/template/toString/ToStringTemplatesManager.java
@@ -33,7 +33,7 @@ import java.io.IOException;
     )}
 )
 public class ToStringTemplatesManager extends TemplatesManager {
-  private static final String DEFAULT_CONCAT = "/org/jetbrains/java/generate/template/toString/DefaultConcatMember.vm";
+  private static final String DEFAULT_CONCAT = "DefaultConcatMember.vm";
   private static final String DEFAULT_CONCAT_GROOVY = "/org/jetbrains/java/generate/template/toString/DefaultConcatMemberGroovy.vm";
   private static final String DEFAULT_CONCAT_SUPER = "/org/jetbrains/java/generate/template/toString/DefaultConcatMemberSuper.vm";
   private static final String DEFAULT_BUFFER = "/org/jetbrains/java/generate/template/toString/DefaultBuffer.vm";
@@ -46,11 +46,8 @@ public class ToStringTemplatesManager extends TemplatesManager {
     return ServiceManager.getService(ToStringTemplatesManager.class);
   }
 
-  public ToStringTemplatesManager() {
-    super(getDefaultTemplates());
-  }
-
-  public static TemplateResource[] getDefaultTemplates() {
+  @Override
+  public TemplateResource[] getDefaultTemplates() {
     try {
       return new TemplateResource[]{
         new TemplateResource("String concat (+)", readFile(DEFAULT_CONCAT), true),