diff --git a/main.cpp b/main.cpp
index e48400e..7569ee0 100644
--- a/main.cpp
+++ b/main.cpp
@@ -229,7 +229,12 @@ void serialDispatch(Serial* serial, SVector<Sensor, MAX_SENSORS>* sensors)
 				char* sec = strtok(NULL, " \n");
 				if(year != NULL && mon != NULL && day != NULL && hour != NULL && min != NULL && sec != NULL)
 				{
-					DS1302::Timeval time = {atoi(sec),atoi(min),atoi(hour),atoi(day),atoi(mon),atoi(year)};
+					DS1302::Timeval time = {static_cast<uint8_t>(atoi(sec)),
+						static_cast<uint8_t>(atoi(min)),
+						static_cast<uint8_t>(atoi(hour)),
+						static_cast<uint8_t>(atoi(day)),
+						static_cast<uint8_t>(atoi(mon)),
+						static_cast<uint8_t>(atoi(year))};
 					clock.setTime(time);
 					serial->write_p(PSTR("date and time set\n"));
 					display.setString("SET     ");
@@ -411,7 +416,9 @@ int main()
 
 	uint16_t i = 0;
 
+#ifdef		HAS_TRANSMITTER
 	bool oldRelaySetting = false;
+#endif
 
 	while(true)
 	{