diff --git a/source/shoh/src/threads/manager/Menu.cpp b/source/shoh/src/threads/manager/Menu.cpp
index f2086f4..6a3afb7 100644
--- a/source/shoh/src/threads/manager/Menu.cpp
+++ b/source/shoh/src/threads/manager/Menu.cpp
@@ -32,9 +32,11 @@ Menu::readSetPointFromEEPROM (void)
 {
   EventRawData *data = (EventRawData *)eeprom.read_from (EEPROM_START_ADDR,
                                                    sizeof(EventRawData));
-  if ((*data) > 0 && (*data) < 120)
+  if ((*data) > 0 && (*data) < 100)
     {
       set_point.setCurrent(*data);
+      Event e(Event::EventType::SetPoint, set_point.getCurrent());
+      _qm->send<Event>(ThreadCommon::QueueManager::master_event_all, &e , 1);
     }
 }
 
diff --git a/source/shoh/src/threads/relay/Relay.cpp b/source/shoh/src/threads/relay/Relay.cpp
index 3647798..d548802 100644
--- a/source/shoh/src/threads/relay/Relay.cpp
+++ b/source/shoh/src/threads/relay/Relay.cpp
@@ -38,7 +38,8 @@ void inline RelayDevice::RelayOff()
 }
 
 
-Relay::Relay(ThreadCommon::QueueManager* qm): _qm(qm) 
+Relay::Relay(ThreadCommon::QueueManager* qm):
+								_qm(qm), ext_temp(0x7f), setpoint(0)
 {
 	LOG_DEBUG("Creating Relay");
 }
@@ -95,9 +96,11 @@ void Relay::parseEvent(Event* e)
 	{
 		case Event::ExternalTemp:
 			ext_temp = rd;
+			LOG_DEBUG("Relay got ext_temp: %d", rd);
 			break;
 		case Event::SetPoint:
 			setpoint = rd;
+			LOG_DEBUG("Relay got setpoint: %d", rd);
 			break;
 		default:
 			assert(0);
diff --git a/source/shoh/src/threads/temperature/Temperature.cpp b/source/shoh/src/threads/temperature/Temperature.cpp
index 50c8da4..9c3692d 100644
--- a/source/shoh/src/threads/temperature/Temperature.cpp
+++ b/source/shoh/src/threads/temperature/Temperature.cpp
@@ -30,7 +30,7 @@ void Temperature::taskFunction()
 		}
 
 		LOG_DEBUG("External temperature is: %d", temp_value);
-		t.setDataOf(Event::ExternalTemp, temp_value);
+		t.setEvent(Event::ExternalTemp, temp_value);
 		_qm->send<Event>(ThreadCommon::QueueManager::master_event_all, &t, 0);
 		vTaskDelay(5000);
 	}