diff --git a/epicardium/api/genapi.py b/epicardium/api/genapi.py
index 5adddf8fcf725744b14ae91e4779ffbbb72f8399..725020e55e0c4f54636da98ed62c6de46b269820 100644
--- a/epicardium/api/genapi.py
+++ b/epicardium/api/genapi.py
@@ -44,7 +44,7 @@ def main():
             re.DOTALL | re.MULTILINE,
         )
 
-        args_matcher = re.compile(r"(?P<type>\w+(?:\*+|\s+))(?P<name>\w+),")
+        args_matcher = re.compile(r"(?P<type>(?:const )?\w+(?:\*+|\s+))(?P<name>\w+),")
 
         # Open output files
         f_client = cx.enter_context(open(args.client, "w"))
diff --git a/epicardium/epicardium.h b/epicardium/epicardium.h
index e74ee0dd2a89e494cfd3f4649267f255e97b70d4..435c9564760ff534ae9d905ed6a1c42f50dfaaf7 100644
--- a/epicardium/epicardium.h
+++ b/epicardium/epicardium.h
@@ -7,7 +7,7 @@
 #endif
 
 #define API_UART_WRITE 0x1
-API(API_UART_WRITE, void epic_uart_write_str(char*str, intptr_t length));
+API(API_UART_WRITE, void epic_uart_write_str(const char*str, intptr_t length));
 
 #define API_UART_READ  0x2
 API(API_UART_READ, char epic_uart_read_chr(void));
diff --git a/epicardium/main.c b/epicardium/main.c
index a3906b0afbe0da3269a5a7ea0f14c469997b9cdd..931779d1b4c6dd4f0415046acaf290d5d25915d5 100644
--- a/epicardium/main.c
+++ b/epicardium/main.c
@@ -2,6 +2,7 @@
 #include "card10.h"
 #include "uart.h"
 #include "cdcacm.h"
+#include "leds.h"
 #include "api/dispatcher.h"
 
 extern mxc_uart_regs_t * ConsoleUart;
@@ -9,20 +10,20 @@ extern mxc_uart_regs_t * ConsoleUart;
 void epic_uart_write_str(char*str, intptr_t length)
 {
 	UART_Write(ConsoleUart, (uint8_t*)str, length);
-    cdcacm_write((uint8_t*)str, length);
+	cdcacm_write((uint8_t*)str, length);
 }
 
 char epic_uart_read_chr(void)
 {
-    while(1) {
-        if(UART_NumReadAvail(ConsoleUart) > 0) {
-	        return UART_ReadByte(ConsoleUart);
-        }
-
-        if(cdcacm_num_read_avail() > 0) {
-            return cdcacm_read();
-        }
-    }
+	while(1) {
+		if(UART_NumReadAvail(ConsoleUart) > 0) {
+			return UART_ReadByte(ConsoleUart);
+		}
+
+		if(cdcacm_num_read_avail() > 0) {
+			return cdcacm_read();
+		}
+	}
 }
 
 void epic_leds_set(int led, uint8_t r, uint8_t g, uint8_t b)
diff --git a/pycardium/mphalport.c b/pycardium/mphalport.c
index 5694f47a65544ae68791595f371afd0cc56643cf..723fe844d9b4bd040649e609148f22b5b0d0287a 100644
--- a/pycardium/mphalport.c
+++ b/pycardium/mphalport.c
@@ -7,6 +7,7 @@
 #include "py/runtime.h"
 
 #include "epicardium.h"
+#include "mxc_delay.h"
 
 /******************************************************************************
  * Serial Communication