diff --git a/src/app_config.cpp b/src/app_config.cpp
index 91aed1ab..2461feff 100644
--- a/src/app_config.cpp
+++ b/src/app_config.cpp
@@ -45,7 +45,6 @@ String emoncms_fingerprint;
 String mqtt_server;
 uint32_t mqtt_port;
 String mqtt_topic;
-bool   mqtt_retained;
 String mqtt_user;
 String mqtt_pass;
 String mqtt_solar;
diff --git a/src/mqtt.cpp b/src/mqtt.cpp
index 8052bade..40b7ecce 100644
--- a/src/mqtt.cpp
+++ b/src/mqtt.cpp
@@ -330,9 +330,11 @@ mqtt_connect()
 
     mqtt_sub_topic = mqtt_topic + "/schedule/set";        
     mqttclient.subscribe(mqtt_sub_topic);
+    yield();
+
     mqtt_sub_topic = mqtt_topic + "/schedule/clear";        
     mqttclient.subscribe(mqtt_sub_topic);
-
+    yield();
     connecting = false;
   });