diff --git a/libraries/HeatpumpIR/CarrierHeatpumpIR.cpp b/libraries/HeatpumpIR/CarrierHeatpumpIR.cpp
index a4d6d70..55fe332 100644
--- a/libraries/HeatpumpIR/CarrierHeatpumpIR.cpp
+++ b/libraries/HeatpumpIR/CarrierHeatpumpIR.cpp
@@ -145,7 +145,7 @@ void CarrierHeatpumpIR::sendCarrier(IRSender& IR, byte operatingMode, byte fanSp
   IR.space(CARRIER_AIRCON1_HDR_SPACE);
 
   // Payload
-  for (int i=0; i<sizeof(sendBuffer); i++) {
+  for (size_t i=0; i<sizeof(sendBuffer); i++) {
     IR.sendIRByte(sendBuffer[i], CARRIER_AIRCON1_BIT_MARK, CARRIER_AIRCON1_ZERO_SPACE, CARRIER_AIRCON1_ONE_SPACE);
   }
 
@@ -157,7 +157,7 @@ void CarrierHeatpumpIR::sendCarrier(IRSender& IR, byte operatingMode, byte fanSp
   IR.space(CARRIER_AIRCON1_HDR_SPACE);
 
   // Payload again
-  for (int i=0; i<sizeof(sendBuffer); i++) {
+  for (size_t i=0; i<sizeof(sendBuffer); i++) {
     IR.sendIRByte(sendBuffer[i], CARRIER_AIRCON1_BIT_MARK, CARRIER_AIRCON1_ZERO_SPACE, CARRIER_AIRCON1_ONE_SPACE);
   }
 
diff --git a/libraries/HeatpumpIR/HeatpumpIR.h b/libraries/HeatpumpIR/HeatpumpIR.h
index c9a6b7b..fb84804 100644
--- a/libraries/HeatpumpIR/HeatpumpIR.h
+++ b/libraries/HeatpumpIR/HeatpumpIR.h
@@ -57,8 +57,8 @@ class HeatpumpIR
 {
   protected:
     HeatpumpIR(); // Cannot create generic heatpump instances
-    const char PROGMEM* _model;
-	const char PROGMEM* _info;
+    const char * _model;
+    const char * _info;
 
   public:
     virtual void send(IRSender& IR, byte powerModeCmd, byte operatingModeCmd, byte fanSpeedCmd, byte temperatureCmd, byte swingVCmd, byte swingHCmd);
diff --git a/libraries/HeatpumpIR/MitsubishiHeatpumpIR.cpp b/libraries/HeatpumpIR/MitsubishiHeatpumpIR.cpp
index fb0cbb4..c9922dc 100644
--- a/libraries/HeatpumpIR/MitsubishiHeatpumpIR.cpp
+++ b/libraries/HeatpumpIR/MitsubishiHeatpumpIR.cpp
@@ -197,7 +197,7 @@ void MitsubishiHeatpumpIR::sendMitsubishi(IRSender& IR, byte powerMode, byte ope
     IR.space(MITSUBISHI_AIRCON1_HDR_SPACE);
 
     // Data
-    for (int i=0; i<sizeof(MitsubishiTemplate); i++) {
+    for (unsigned int i=0; i<sizeof(MitsubishiTemplate); i++) {
       IR.sendIRByte(MitsubishiTemplate[i], MITSUBISHI_AIRCON1_BIT_MARK, MITSUBISHI_AIRCON1_ZERO_SPACE, MITSUBISHI_AIRCON1_ONE_SPACE);
     }
 
diff --git a/libraries/MySensors/examples/HeatpumpIRController/HeatpumpIRController.ino b/libraries/MySensors/examples/HeatpumpIRController/HeatpumpIRController.ino
index 7ef8f5c..84ffd71 100644
--- a/libraries/MySensors/examples/HeatpumpIRController/HeatpumpIRController.ino
+++ b/libraries/MySensors/examples/HeatpumpIRController/HeatpumpIRController.ino
@@ -89,8 +89,7 @@ void loop()
 // Handle incoming messages from the MySensors Gateway
 void incomingMessage(const MyMessage &message) {
 
-	const char *irData;
-	long irCommand;
+    const char *irData;
 
   // V_IR type message
   if (message.type==V_IR_SEND) {
@@ -161,10 +160,10 @@ libraries\HeatpumpIR\HeatpumpIR.h for the constants
   byte fan   = (irCommand & 0x00000F00) >> 8;
   byte temp  = (irCommand & 0x000000FF);
 
-  prog_char* buf;
+  const char* buf;
   Serial.print(F("Model: "));
 
-  buf = (prog_char*)heatpumpIR[model]->model();
+  buf = heatpumpIR[model]->model();
   // 'model' is a PROGMEM pointer, so need to write a byte at a time
   while (char modelChar = pgm_read_byte(buf++))
   {