diff --git a/plugins/plugin-composer/che-plugin-composer-server/src/main/java/org/eclipse/che/plugin/composer/server/ComposerModule.java b/plugins/plugin-composer/che-plugin-composer-server/src/main/java/org/eclipse/che/plugin/composer/server/ComposerModule.java
index d94df1d757..200dc5095c 100644
--- a/plugins/plugin-composer/che-plugin-composer-server/src/main/java/org/eclipse/che/plugin/composer/server/ComposerModule.java
+++ b/plugins/plugin-composer/che-plugin-composer-server/src/main/java/org/eclipse/che/plugin/composer/server/ComposerModule.java
@@ -30,7 +30,8 @@ import static com.google.inject.multibindings.Multibinder.newSetBinder;
  *
  * @author Kaloyan Raev
  */
-@DynaModule
+// FIXME: spi
+//@DynaModule
 public class ComposerModule extends AbstractModule {
 
     /** {@inheritDoc} */
diff --git a/plugins/plugin-machine/che-plugin-machine-ext-server/src/main/java/org/eclipse/che/ide/ext/machine/server/MachineModule.java b/plugins/plugin-machine/che-plugin-machine-ext-server/src/main/java/org/eclipse/che/ide/ext/machine/server/MachineModule.java
index f482d13685..c9d8e940fd 100644
--- a/plugins/plugin-machine/che-plugin-machine-ext-server/src/main/java/org/eclipse/che/ide/ext/machine/server/MachineModule.java
+++ b/plugins/plugin-machine/che-plugin-machine-ext-server/src/main/java/org/eclipse/che/ide/ext/machine/server/MachineModule.java
@@ -24,6 +24,7 @@ public class MachineModule extends AbstractModule {
     protected void configure() {
         bind(KeysInjector.class).asEagerSingleton();
         bind(WorkspaceSshKeys.class).asEagerSingleton();
-        bind(RecipeScriptDownloadService.class);
+// FIXME: spi
+//        bind(RecipeScriptDownloadService.class);
     }
 }
diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/spi/RuntimeContext.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/spi/RuntimeContext.java
index 0670f0eb76..c7b6726219 100644
--- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/spi/RuntimeContext.java
+++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/spi/RuntimeContext.java
@@ -71,15 +71,14 @@ public abstract class RuntimeContext {
      *
      * @param stopOptions
      * @throws StateException
-     *         when the context is already used or the context
-     *         can't be stopped because otherwise it would be in inconsistent state
+     *         when the context can't be stopped because otherwise it would be in inconsistent state
      *         (e.g. stop(interrupt) might not be allowed during start)
      * @throws InfrastructureException
      *         when any other error occurs
      */
     public final void stop(Map<String, String> stopOptions) throws InfrastructureException {
-        if (this.state != null)
-            throw new StateException("Context already used");
+        if (this.state != WorkspaceStatus.RUNNING)
+            throw new StateException("The environment must be running");
         state = WorkspaceStatus.STOPPING;
         internalStop(stopOptions);
         state = WorkspaceStatus.STOPPED;