diff --git a/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java
index 9bffdf146b2b..28fc81473e6e 100644
--- a/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java
+++ b/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java
@@ -639,7 +639,7 @@ public abstract class AbstractColorsScheme implements EditorColorsScheme, Serial
       }
 
       if (myParentScheme != null) {
-        // fallback attributes must be not used, otherwise derived scheme as copy will not have such ke
+        // fallback attributes must be not used, otherwise derived scheme as copy will not have such key
         TextAttributes parentAttributes = myParentScheme instanceof AbstractColorsScheme
                                           ? ((AbstractColorsScheme)myParentScheme).getDirectlyDefinedAttributes(key)
                                           : myParentScheme.getAttributes(key);
diff --git a/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontDescription.java b/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontDescription.java
index db93b7363385..b6050302adb9 100644
--- a/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontDescription.java
+++ b/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontDescription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -232,7 +232,7 @@ public abstract class ColorAndFontDescription extends TextAttributes implements
     return false;
   }
 
-  public boolean isInherited() {
+  public final boolean isInherited() {
     return isInherited;
   }