diff --git a/apps/system/components/OpenTitanUARTDriver/OpenTitanUARTDriver.camkes b/apps/system/components/OpenTitanUARTDriver/OpenTitanUARTDriver.camkes
index 4f911c7..29eb3aa 100644
--- a/apps/system/components/OpenTitanUARTDriver/OpenTitanUARTDriver.camkes
+++ b/apps/system/components/OpenTitanUARTDriver/OpenTitanUARTDriver.camkes
@@ -5,7 +5,7 @@
  * Apache License 2.0
  */
 
-import "../../interfaces/RustIO.idl4";
+import <RustIO.idl4>;
 
 component OpenTitanUARTDriver {
   dataport Buf mmio_region;
diff --git a/apps/system/components/OpenTitanUARTDriver/src/driver.c b/apps/system/components/OpenTitanUARTDriver/src/driver.c
index 3787f7b..3553b21 100644
--- a/apps/system/components/OpenTitanUARTDriver/src/driver.c
+++ b/apps/system/components/OpenTitanUARTDriver/src/driver.c
@@ -47,8 +47,8 @@
   ((value & UART_##regname##_##subfield##_MASK)     \
    << UART_##regname##_##subfield##_OFFSET)
 
-#define LOCK(lockname) seL4_Assert(lockname##_lock() == 0);
-#define UNLOCK(lockname) seL4_Assert(lockname##_unlock() == 0);
+#define LOCK(lockname) seL4_Assert(lockname##_lock() == 0)
+#define UNLOCK(lockname) seL4_Assert(lockname##_unlock() == 0)
 #define ASSERT_OR_RETURN(x)            \
   if (!(bool)(x)) {                    \
     return UARTDriver_AssertionFailed; \