diff --git a/eraser-base/src/main/jastadd/LastChanged.jrag b/eraser-base/src/main/jastadd/LastChanged.jrag
index 2ac7dfc95e247aa988f9c518b64c687477b9bbb5..9c52887c2349595a6d8546f632882ccfb9951cb9 100644
--- a/eraser-base/src/main/jastadd/LastChanged.jrag
+++ b/eraser-base/src/main/jastadd/LastChanged.jrag
@@ -3,16 +3,16 @@ aspect LastChanged {
     this.setValue(Instant.now());
   }
 
-  public boolean LastChanged.checkStateProcessingTime(FrequencySetting FrequencySetting) {
-    if (FrequencySetting == null) {
+  public boolean LastChanged.checkStateProcessingTime(FrequencySetting frequencySetting) {
+    if (frequencySetting == null) {
       return true;
     }
-    double frequency = FrequencySetting.getEventProcessingFrequency();
+    double frequency = frequencySetting.getEventProcessingFrequency();
     Instant lastStateChange = this.getValue();
     if (lastStateChange == null) {
       return true;
     }
-    return lastStateChange.toEpochMilli() + (1 / frequency) * 1000 < Instant.now().toEpochMilli();
-  }
+    return Instant.now().toEpochMilli() - lastStateChange.toEpochMilli() > (1 / frequency) * 1000;
+    }
 
 }
diff --git a/eraser-base/src/main/jastadd/Resolving.jrag b/eraser-base/src/main/jastadd/Resolving.jrag
index f194a9f72348ede36fc56b6840a16b082880906c..7d6656121956a1c3014d1fed3dbc14832b1556d1 100644
--- a/eraser-base/src/main/jastadd/Resolving.jrag
+++ b/eraser-base/src/main/jastadd/Resolving.jrag
@@ -118,7 +118,7 @@ aspect Resolving {
 
   syn java.util.Optional<FrequencySetting> SmartHomeEntityModel.resolveFrequencySetting(String performanceId) {
     for (FrequencySetting performance : getFrequencySettingList()) {
-      if (performance.getLabel().equals(performanceId)) {
+      if (performance.getID().equals(performanceId)) {
         return java.util.Optional.of(performance);
       }
     }
diff --git a/eraser-base/src/main/java/de/tudresden/inf/st/eraser/jastadd/model/MQTTSenderImpl.java b/eraser-base/src/main/java/de/tudresden/inf/st/eraser/jastadd/model/MQTTSenderImpl.java
index 9fecbe6913f798a530c29b45be7af793df56e3b1..cfd9f6eca7d5f9f8f0faa5a3d10e8c93df313c3e 100644
--- a/eraser-base/src/main/java/de/tudresden/inf/st/eraser/jastadd/model/MQTTSenderImpl.java
+++ b/eraser-base/src/main/java/de/tudresden/inf/st/eraser/jastadd/model/MQTTSenderImpl.java
@@ -30,8 +30,9 @@ public class MQTTSenderImpl implements MQTTSender {
 
   @Override
   public MQTTSender setHost(ExternalHost host) {
+    int port = host.getPort()!=0 ? host.getPort() : 1883;
     /* The host running the MQTT broker. */
-    URI hostUri = URI.create("tcp://" + host.getHostName() + ":" + host.getPort());
+    URI hostUri = URI.create("tcp://" + host.getHostName() + ":" + port);
     logger.debug("Host is {}", hostUri);
     MQTT mqtt = new MQTT();
     String username = host.getUserName();
diff --git a/eraser-base/src/main/java/de/tudresden/inf/st/eraser/util/MqttReceiver.java b/eraser-base/src/main/java/de/tudresden/inf/st/eraser/util/MqttReceiver.java
index 161cbaf16025d56ad5a4f9189ecde65203108051..82e263212b31c7240f3285547777b201a4c44979 100644
--- a/eraser-base/src/main/java/de/tudresden/inf/st/eraser/util/MqttReceiver.java
+++ b/eraser-base/src/main/java/de/tudresden/inf/st/eraser/util/MqttReceiver.java
@@ -53,7 +53,10 @@ public class MqttReceiver implements AutoCloseable {
    * Sets the host to receive messages from
    */
   public void setHost(ExternalHost externalHost) {
-    this.host = URI.create("tcp://" + externalHost.getHostName() + ":" + externalHost.getPort());
+    int port = externalHost.getPort()!=0 ? externalHost.getPort() : 1883;
+    this.host = URI.create("tcp://" + externalHost.getHostName() + ":" + port);
+    this.username = externalHost.getUserName();
+    this.password = externalHost.getPassword();
     logger.debug("Host is {}", externalHost.getHostName());
   }