diff --git a/module/dal/control/src/main/java/org/openbase/bco/dal/control/layer/unit/scene/SceneControllerImpl.java b/module/dal/control/src/main/java/org/openbase/bco/dal/control/layer/unit/scene/SceneControllerImpl.java
index 817ddd693c..35ec94beeb 100644
--- a/module/dal/control/src/main/java/org/openbase/bco/dal/control/layer/unit/scene/SceneControllerImpl.java
+++ b/module/dal/control/src/main/java/org/openbase/bco/dal/control/layer/unit/scene/SceneControllerImpl.java
@@ -198,7 +198,7 @@ public UnitConfig applyConfigUpdate(UnitConfig config) throws CouldNotPerformExc
                     .setInterruptible(true)
                     .setSchedulable(true)
                     .setPriority(Priority.HIGH)
-                    .setExecutionTimePeriod(Duration.ofMinutes(30).toMillis()).build();
+                    .setExecutionTimePeriod(TimeUnit.MICROSECONDS.convert(Duration.ofMinutes(30))).build();
             requiredActionPool.initViaServiceStateDescription(config.getSceneConfig().getRequiredServiceStateDescriptionList(), actionParameterPrototype, () -> getActivationState().getValue() == ActivationState.State.ACTIVE);
             optionalActionPool.initViaServiceStateDescription(config.getSceneConfig().getOptionalServiceStateDescriptionList(), actionParameterPrototype, () -> getActivationState().getValue() == ActivationState.State.ACTIVE);
             return config;
@@ -209,7 +209,7 @@ public UnitConfig applyConfigUpdate(UnitConfig config) throws CouldNotPerformExc
     public void activate() throws InterruptedException, CouldNotPerformException {
         super.activate();
         synchronized (buttonObserverLock) {
-            buttonRemoteSet.stream().forEach((button) -> {
+            buttonRemoteSet.forEach((button) -> {
                 button.addDataObserver(buttonObserver);
             });
         }
@@ -221,7 +221,7 @@ public void activate() throws InterruptedException, CouldNotPerformException {
     @Override
     public void deactivate() throws InterruptedException, CouldNotPerformException {
         synchronized (buttonObserverLock) {
-            buttonRemoteSet.stream().forEach((button) -> {
+            buttonRemoteSet.forEach((button) -> {
                 button.removeDataObserver(buttonObserver);
             });
         }