diff --git a/src/devices/screen.c b/src/devices/screen.c
index f61b318..c51ff5b 100644
--- a/src/devices/screen.c
+++ b/src/devices/screen.c
@@ -53,7 +53,8 @@ screen_blit(UxnScreen *p, Layer *layer, Uint16 x, Uint16 y, Uint8 *sprite, Uint8
 	}
 }
 
-static void layer_clear(UxnScreen *p, Layer *layer)
+static void
+layer_clear(UxnScreen *p, Layer *layer)
 {
 	Uint32 i, size = p->width * p->height;
 	for(i = 0; i < size; i++)
diff --git a/src/devices/system.c b/src/devices/system.c
index 47ad156..f1607cd 100644
--- a/src/devices/system.c
+++ b/src/devices/system.c
@@ -63,6 +63,8 @@ system_deo(Uxn *u, Uint8 *d, Uint8 port)
 	switch(port) {
 	case 0x2: u->wst = (Stack *)(u->ram + (d[port] ? (d[port] * 0x100) : 0x10000)); break;
 	case 0x3: u->rst = (Stack *)(u->ram + (d[port] ? (d[port] * 0x100) : 0x10100)); break;
-	case 0xe: if(u->wst->ptr || u->rst->ptr) system_inspect(u); break;
+	case 0xe:
+		if(u->wst->ptr || u->rst->ptr) system_inspect(u);
+		break;
 	}
 }
diff --git a/src/uxn11.c b/src/uxn11.c
index 0c3ee10..e406e2f 100644
--- a/src/uxn11.c
+++ b/src/uxn11.c
@@ -94,7 +94,7 @@ emu_deo(Uxn *u, Uint8 addr, Uint8 v)
 	case 0xb0: file_deo(1, u->ram, &u->dev[d], p); break;
 	}
 	if(p == 0x01 && !(SUPPORT & mask))
-		fprintf(stderr, "Warning: Incompatible emulation, device: %02x.\n", d >> 4);
+		fprintf(stderr, "Warning: Incompatible emulation, device: %02x.\n", d);
 }
 
 static void
diff --git a/src/uxncli.c b/src/uxncli.c
index b64bb3f..0cb8cf2 100644
--- a/src/uxncli.c
+++ b/src/uxncli.c
@@ -70,7 +70,7 @@ emu_deo(Uxn *u, Uint8 addr, Uint8 v)
 	case 0xb0: file_deo(1, u->ram, &u->dev[d], p); break;
 	}
 	if(p == 0x01 && !(SUPPORT & mask))
-		fprintf(stderr, "Warning: Incompatible emulation, device: %02x.\n", d >> 4);
+		fprintf(stderr, "Warning: Incompatible emulation, device: %02x.\n", d);
 }
 
 int