diff --git a/source/arm11/fs.c b/source/arm11/fs.c
index 33a06e1..63642d1 100644
--- a/source/arm11/fs.c
+++ b/source/arm11/fs.c
@@ -27,13 +27,13 @@
 s32 fMount(FsDrive drive)
 {
 	const u32 cmdBuf = drive;
-	return (s32)PXI_sendCmd(IPC_CMD9_FMOUNT, &cmdBuf, 1);
+	return PXI_sendCmd(IPC_CMD9_FMOUNT, &cmdBuf, 1);
 }
 
 s32 fUnmount(FsDrive drive)
 {
 	const u32 cmdBuf = drive;
-	return (s32)PXI_sendCmd(IPC_CMD9_FUNMOUNT, &cmdBuf, 1);
+	return PXI_sendCmd(IPC_CMD9_FUNMOUNT, &cmdBuf, 1);
 }
 
 s32 fOpen(const char *const path, FsOpenMode mode)
@@ -43,13 +43,13 @@
 	cmdBuf[1] = strlen(path);
 	cmdBuf[2] = mode;
 
-	return (s32)PXI_sendCmd(IPC_CMD9_FOPEN, cmdBuf, 3);
+	return PXI_sendCmd(IPC_CMD9_FOPEN, cmdBuf, 3);
 }
 
 s32 fClose(s32 handle)
 {
 	const u32 cmdBuf = handle;
-	return (s32)PXI_sendCmd(IPC_CMD9_FCLOSE, &cmdBuf, 1);
+	return PXI_sendCmd(IPC_CMD9_FCLOSE, &cmdBuf, 1);
 }
 
 s32 fRead(s32 handle, void *const buf, u32 size)
@@ -59,7 +59,7 @@
 	cmdBuf[1] = size;
 	cmdBuf[2] = handle;
 
-	return (s32)PXI_sendCmd(IPC_CMD9_FREAD, cmdBuf, 3);
+	return PXI_sendCmd(IPC_CMD9_FREAD, cmdBuf, 3);
 }
 
 s32 fWrite(s32 handle, const void *const buf, u32 size)
@@ -69,5 +69,5 @@
 	cmdBuf[1] = size;
 	cmdBuf[2] = handle;
 
-	return (s32)PXI_sendCmd(IPC_CMD9_FWRITE, cmdBuf, 3);
+	return PXI_sendCmd(IPC_CMD9_FWRITE, cmdBuf, 3);
 }
diff --git a/source/arm11/main.c b/source/arm11/main.c
index 39a486c..ea464be 100644
--- a/source/arm11/main.c
+++ b/source/arm11/main.c
@@ -29,7 +29,6 @@
 #include "arm11/menu_fb3ds.h"
 #include "arm11/console.h"
 #include "arm11/fmt.h"
-#include "fs.h"
 
 
 volatile bool g_poweroffAllowed = false;
@@ -51,33 +50,6 @@
 	PrintConsole desc_con;
 	consoleInit(SCREEN_TOP, &desc_con, false);
 
-	/*ee_puts("fs test...");
-	s32 fs = fMount(FS_DRIVE_SDMC);
-	if(fs < 0)
-	{
-		ee_printf("Failed to mount SD! %d\n", fs);
-		return 1;
-	}
-
-	s32 f = fOpen("sdmc:/_testFile_.txt", FS_OPEN_CREATE_ALWAYS | FS_OPEN_WRITE);
-	if(f < 0)
-	{
-		ee_printf("Failed to open file! %d\n", f);
-		fUnmount(fs);
-		return 1;
-	}
-
-	s32 res = fWrite(f, "It worked!!!", 13);
-	if(res < 0)
-	{
-		ee_printf("Failed to write to file! %d\n", res);
-		fClose(f);
-		fUnmount(fs);
-		return 1;
-	}
-	fClose(f);
-	fUnmount(fs);*/
-
 	// run menu
 	menuProcess(&menu_con, &desc_con, menu_fb3ds);
 	
diff --git a/source/arm9/ipc_handler.c b/source/arm9/ipc_handler.c
index f710a2d..406f7b8 100644
--- a/source/arm9/ipc_handler.c
+++ b/source/arm9/ipc_handler.c
@@ -37,22 +37,22 @@
 	switch(cmdId)
 	{
 		case IPC_CMD_ID_MASK(IPC_CMD9_FMOUNT):
-			result = (u32)fMount(buf[0]);
+			result = fMount(buf[0]);
 			break;
 		case IPC_CMD_ID_MASK(IPC_CMD9_FUNMOUNT):
-			result = (u32)fUnmount(buf[0]);
+			result = fUnmount(buf[0]);
 			break;
 		case IPC_CMD_ID_MASK(IPC_CMD9_FOPEN):
-			result = (u32)fOpen((const char *const)buf[0], buf[2]);
+			result = fOpen((const char *const)buf[0], buf[2]);
 			break;
 		case IPC_CMD_ID_MASK(IPC_CMD9_FCLOSE):
-			result = (u32)fClose(buf[0]);
+			result = fClose(buf[0]);
 			break;
 		case IPC_CMD_ID_MASK(IPC_CMD9_FREAD):
-			result = (u32)fRead(buf[2], (void *const)buf[0], buf[1]);
+			result = fRead(buf[2], (void *const)buf[0], buf[1]);
 			break;
 		case IPC_CMD_ID_MASK(IPC_CMD9_FWRITE):
-			result = (u32)fWrite(buf[2], (const void *const)buf[0], buf[1]);
+			result = fWrite(buf[2], (const void *const)buf[0], buf[1]);
 			break;
 		case IPC_CMD_ID_MASK(IPC_CMD9_FOPEN_DIR):
 			break;
diff --git a/source/hardware/pxi.c b/source/hardware/pxi.c
index 110db5b..f9d91a4 100644
--- a/source/hardware/pxi.c
+++ b/source/hardware/pxi.c
@@ -78,7 +78,7 @@
 
 u32 PXI_sendCmd(u32 cmd, const u32 *const buf, u8 words)
 {
-	if(!buf) words = 0;
+	fb_assert(buf != NULL);
 	fb_assert(words <= IPC_MAX_PARAMS);
 
 	const u8 inBufs = IPC_CMD_IN_BUFS_MASK(cmd);
@@ -91,7 +91,7 @@
 	for(u32 i = inBufs; i < inBufs + outBufs; i++)
 	{
 		const IpcBuffer *const outBuf = (IpcBuffer*)&buf[i * sizeof(IpcBuffer) / 4];
-		invalidateDCacheRange(outBuf->ptr, outBuf->size);
+		flushInvalidateDCacheRange(outBuf->ptr, outBuf->size);
 	}
 
 	while(REG_PXI_CNT & PXI_SEND_FIFO_FULL);