diff --git a/platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java
index cd1c8db4600a..4a52e0efca5c 100644
--- a/platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java
@@ -276,7 +276,7 @@ public class CodeStyleSchemesConfigurable extends SearchableConfigurable.Parent.
 
         @Override
         public void schemeChanged(final CodeStyleScheme scheme) {
-          //do nothing
+          reset();
         }
       });
     }
diff --git a/python/helpers/coverage_runner/run_coverage.py b/python/helpers/coverage_runner/run_coverage.py
index c9892d815929..f637d6e8d42c 100644
--- a/python/helpers/coverage_runner/run_coverage.py
+++ b/python/helpers/coverage_runner/run_coverage.py
@@ -40,6 +40,8 @@ for arg in sys.argv:
         argv.append(arg)
 sys.argv = argv
 
+cwd = os.getcwd()
 main()
 if run_cov:
+    os.chdir(cwd)
     main(["xml", "-o", coverage_file + ".xml", "--ignore-errors"])
\ No newline at end of file