diff --git a/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeConfigurable.java b/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeConfigurable.java
index 6ac59b224dbd..37e7089dc5a9 100644
--- a/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeConfigurable.java
@@ -154,7 +154,7 @@ public class FileTypeConfigurable extends BaseConfigurable implements Searchable
   @Override
   public boolean isModified() {
     if (!myManager.isIgnoredFilesListEqualToCurrent(myFileTypePanel.myIgnoreFilesField.getText())) return true;
-    HashSet types = new HashSet(Arrays.asList(getModifiableFileTypes()));
+    HashSet<FileType> types = new HashSet<FileType>(Arrays.asList(getModifiableFileTypes()));
     return !myTempPatternsTable.equals(myManager.getExtensionMap()) || !myTempFileTypes.equals(types) ||
            !myOriginalToEditedMap.isEmpty() ||
            !myTempTemplateDataLanguages.equals(TemplateDataLanguagePatterns.getInstance().getAssocTable());
diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectLanguageAction.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectLanguageAction.java
index 0d6a2be57bf5..bc54939ff202 100644
--- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectLanguageAction.java
+++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectLanguageAction.java
@@ -192,8 +192,10 @@ public class InjectLanguageAction implements IntentionAction {
     JBPopup popup = new PopupChooserBuilder(list).setItemChoosenCallback(new Runnable() {
       public void run() {
         Injectable value = (Injectable)list.getSelectedValue();
-        onChosen.process(value);
-        PropertiesComponent.getInstance().setValue(LAST_INJECTED_LANGUAGE, value.getId());
+        if (value != null) {
+          onChosen.process(value);
+          PropertiesComponent.getInstance().setValue(LAST_INJECTED_LANGUAGE, value.getId());
+        }
       }
     }).setFilteringEnabled(new Function<Object, String>() {
       @Override
diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/moveUpDown/XmlMover.java b/xml/impl/src/com/intellij/codeInsight/editorActions/moveUpDown/XmlMover.java
index 98e646c5b8a9..770ac7a1b868 100644
--- a/xml/impl/src/com/intellij/codeInsight/editorActions/moveUpDown/XmlMover.java
+++ b/xml/impl/src/com/intellij/codeInsight/editorActions/moveUpDown/XmlMover.java
@@ -19,6 +19,7 @@ import com.intellij.lang.injection.InjectedLanguageManager;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.util.TextRange;
+import com.intellij.openapi.util.UnfairTextRange;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiNamedElement;
@@ -106,7 +107,7 @@ class XmlMover extends LineMover {
       movedLineStart = updateMovedRegionStart(document, movedLineStart, textRange.getStartOffset(), info, down);
     }
 
-    final TextRange moveDestinationRange = new TextRange(
+    final TextRange moveDestinationRange = new UnfairTextRange(
       document.getLineStartOffset(info.toMove2.startLine),
       document.getLineEndOffset(info.toMove2.endLine - 1)
     );
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTagImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTagImpl.java
index c986bb1ebb25..b030815ad2a4 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTagImpl.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTagImpl.java
@@ -296,7 +296,7 @@ public class XmlTagImpl extends XmlElementImpl implements XmlTag {
     final String schemaLocationDeclaration = getAttributeValue("schemaLocation", XmlUtil.XML_SCHEMA_INSTANCE_URI);
 
     if (noNamespaceDeclaration != null) {
-      map = initializeSchema(XmlUtil.EMPTY_URI, null, noNamespaceDeclaration, map);
+      map = initializeSchema(XmlUtil.EMPTY_URI, null, noNamespaceDeclaration, null);
     }
     if (schemaLocationDeclaration != null) {
       final StringTokenizer tokenizer = new StringTokenizer(schemaLocationDeclaration);
@@ -334,7 +334,7 @@ public class XmlTagImpl extends XmlElementImpl implements XmlTag {
     return null;
   }
 
-  private Map<String, CachedValue<XmlNSDescriptor>> initializeSchema(final String namespace,
+  private Map<String, CachedValue<XmlNSDescriptor>> initializeSchema(final @NotNull String namespace,
                                                                      @Nullable final String version,
                                                                      final String fileLocation,
                                                                      Map<String, CachedValue<XmlNSDescriptor>> map) {
@@ -422,7 +422,7 @@ public class XmlTagImpl extends XmlElementImpl implements XmlTag {
   }
 
   @Nullable
-  private PsiMetaOwner retrieveOwner(final XmlFile file, final String namespace) {
+  private PsiMetaOwner retrieveOwner(final XmlFile file, final @NotNull String namespace) {
     if (file == null) {
       return namespace.equals(XmlUtil.getTargetSchemaNsFromTag(this)) ? this : null;
     }