diff --git a/right/src/buspal/command.c b/right/src/buspal/command.c
index 99e9445..e6cf4c1 100644
--- a/right/src/buspal/command.c
+++ b/right/src/buspal/command.c
@@ -593,9 +593,6 @@ static status_t handle_command_internal(uint8_t *packet, uint32_t packetLength)
                     else
                     {
 #if FIXED_BUSPAL_BOOTLOADER
-                        size_t offset;
-                        int res;
-
                         status = kStatus_Success; /* set default */
                         res = WaitForStartByte(rxBuf, &offset);
                         if (res==1 && offset==1)
diff --git a/right/src/buspal/packet/serial_packet.c b/right/src/buspal/packet/serial_packet.c
index cf561b3..21ff990 100644
--- a/right/src/buspal/packet/serial_packet.c
+++ b/right/src/buspal/packet/serial_packet.c
@@ -110,7 +110,7 @@ status_t serial_packet_read(const peripheral_descriptor_t *self,
 
         // Receive the framing data packet.
         isPacketOk = true;
-        status_t status = read_data_packet(&framingPacket, g_serialContext.data, packetType);
+        status = read_data_packet(&framingPacket, g_serialContext.data, packetType);
         if (status != kStatus_Success)
         {
             // No packet available.
diff --git a/right/src/led_display.c b/right/src/led_display.c
index 7a7e878..76922b4 100644
--- a/right/src/led_display.c
+++ b/right/src/led_display.c
@@ -109,7 +109,7 @@ void LedDisplay_SetIcon(led_display_icon_t icon, bool isEnabled)
 
 void LedDisplay_UpdateIcons(void)
 {
-    for (uint8_t i=0; i<=LedDisplayIcon_Last; i++) {
+    for (led_display_icon_t i=0; i<=LedDisplayIcon_Last; i++) {
         LedDisplay_SetIcon(i, ledIconStates[i]);
     }
 }
diff --git a/right/src/main.c b/right/src/main.c
index 2897680..12772f2 100644
--- a/right/src/main.c
+++ b/right/src/main.c
@@ -24,7 +24,7 @@ static void hardwareConfigurationReadFinished(void)
     EEPROM_LaunchTransfer(EepromOperation_Read, ConfigBufferId_StagingUserConfig, userConfigurationReadFinished);
 }
 
-void main(void)
+int main(void)
 {
     InitClock();
     InitPeripherals();