diff --git a/include/arm9/hardware/crypto.h b/include/arm9/hardware/crypto.h
index f1de5e6..8a13caa 100644
--- a/include/arm9/hardware/crypto.h
+++ b/include/arm9/hardware/crypto.h
@@ -33,7 +33,7 @@
 
 #define AES_FLUSH_READ_FIFO   (1u<<10)
 #define AES_FLUSH_WRITE_FIFO  (1u<<11)
-#define AES_MAC_SIZE(n)       (((n - 2) / 2)<<16)
+#define AES_MAC_SIZE(n)       ((((n) - 2) / 2)<<16)
 #define AES_PASS_PAYLOARD     (1u<<19) // Passes the associated data to REG_AESRDFIFO
 #define AES_MAC_SRC_REG       (1u<<20)
 #define AES_IS_MAC_VALID      ((bool)(REG_AESCNT>>21 & 1u))
diff --git a/include/arm9/hardware/ndma.h b/include/arm9/hardware/ndma.h
index 4999370..574919e 100644
--- a/include/arm9/hardware/ndma.h
+++ b/include/arm9/hardware/ndma.h
@@ -90,13 +90,13 @@
 #define REG_NDMA7_FILL_DATA      *((vu32*)(NDMA_REGS_BASE + 0xDC))
 #define REG_NDMA7_CNT            *((vu32*)(NDMA_REGS_BASE + 0xE0))
 
-#define REG_NDMA_SRC_ADDR(n)     *((vu32*)(NDMA_REGS_BASE + 0x04 + (n * 28)))
-#define REG_NDMA_DST_ADDR(n)     *((vu32*)(NDMA_REGS_BASE + 0x08 + (n * 28)))
-#define REG_NDMA_TOTAL_CNT(n)    *((vu32*)(NDMA_REGS_BASE + 0x0C + (n * 28)))
-#define REG_NDMA_LOG_BLK_CNT(n)  *((vu32*)(NDMA_REGS_BASE + 0x10 + (n * 28)))
-#define REG_NDMA_INT_CNT(n)      *((vu32*)(NDMA_REGS_BASE + 0x14 + (n * 28)))
-#define REG_NDMA_FILL_DATA(n)    *((vu32*)(NDMA_REGS_BASE + 0x18 + (n * 28)))
-#define REG_NDMA_CNT(n)          *((vu32*)(NDMA_REGS_BASE + 0x1C + (n * 28)))
+#define REG_NDMA_SRC_ADDR(n)     *((vu32*)(NDMA_REGS_BASE + 0x04 + ((n) * 28)))
+#define REG_NDMA_DST_ADDR(n)     *((vu32*)(NDMA_REGS_BASE + 0x08 + ((n) * 28)))
+#define REG_NDMA_TOTAL_CNT(n)    *((vu32*)(NDMA_REGS_BASE + 0x0C + ((n) * 28)))
+#define REG_NDMA_LOG_BLK_CNT(n)  *((vu32*)(NDMA_REGS_BASE + 0x10 + ((n) * 28)))
+#define REG_NDMA_INT_CNT(n)      *((vu32*)(NDMA_REGS_BASE + 0x14 + ((n) * 28)))
+#define REG_NDMA_FILL_DATA(n)    *((vu32*)(NDMA_REGS_BASE + 0x18 + ((n) * 28)))
+#define REG_NDMA_CNT(n)          *((vu32*)(NDMA_REGS_BASE + 0x1C + ((n) * 28)))
 
 
 // REG_NDMA_GLOBAL_CNT
diff --git a/include/arm9/hardware/timer.h b/include/arm9/hardware/timer.h
index 3949f31..27aec3f 100644
--- a/include/arm9/hardware/timer.h
+++ b/include/arm9/hardware/timer.h
@@ -28,10 +28,10 @@
 #define TIMER_ENABLE        (1u<<7)
 
 // Convenience macros for calculating the ticks. Based on libnds
-#define TIMER_FREQ(n)       (0x10000u - (u16)(TIMER_BASE_FREQ / n))
-#define TIMER_FREQ_64(n)    (0x10000u - (u16)(TIMER_BASE_FREQ / 64.0 / n))
-#define TIMER_FREQ_256(n)   (0x10000u - (u16)(TIMER_BASE_FREQ / 256.0 / n))
-#define TIMER_FREQ_1024(n)  (0x10000u - (u16)(TIMER_BASE_FREQ / 1024.0 / n))
+#define TIMER_FREQ(n)       (0x10000u - (u16)(TIMER_BASE_FREQ / (n)))
+#define TIMER_FREQ_64(n)    (0x10000u - (u16)(TIMER_BASE_FREQ / 64.0 / (n)))
+#define TIMER_FREQ_256(n)   (0x10000u - (u16)(TIMER_BASE_FREQ / 256.0 / (n)))
+#define TIMER_FREQ_1024(n)  (0x10000u - (u16)(TIMER_BASE_FREQ / 1024.0 / (n)))
 
 
 typedef enum
diff --git a/include/hardware/pxi.h b/include/hardware/pxi.h
index 5570044..e13338d 100644
--- a/include/hardware/pxi.h
+++ b/include/hardware/pxi.h
@@ -37,7 +37,7 @@
 
 // Defines for PX_SYNC regs
 #define PXI_DATA_RECEIVED            (REG_PXI_SYNC & 0xFFu)
-#define PXI_DATA_SENT(sent)          ((REG_PXI_SYNC & ~(0xFFu<<8)) | sent<<8)
+#define PXI_DATA_SENT(sent)          ((REG_PXI_SYNC & ~(0xFFu<<8)) | (sent)<<8)
 #ifdef ARM9
 #define PXI_TRIGGER_SYNC_IRQ         (1u<<29)
 #elif ARM11
diff --git a/source/arm11/config.c b/source/arm11/config.c
index cab2f2d..3d871ac 100644
--- a/source/arm11/config.c
+++ b/source/arm11/config.c
@@ -33,7 +33,7 @@
 #include "arm11/config.h"
 #include "arm11/fmt.h"
 
-#define MAX_FILE_SIZE	0x4000 - 1
+#define MAX_FILE_SIZE	(0x4000 - 1)
 
 static const char *SdmcFilepath = "sdmc:/3ds/fastbootcfg.txt";
 static const char *NandFilepath = "nand:/fastboot3DS/fastbootcfg.txt";
diff --git a/source/arm11/hardware/mmu.c b/source/arm11/hardware/mmu.c
index 2ce31db..5571d72 100644
--- a/source/arm11/hardware/mmu.c
+++ b/source/arm11/hardware/mmu.c
@@ -53,10 +53,10 @@
 #define POLICY_WRITE_THROUGH_NO_ALLOC_BUFFERED (0b10u) // Behaves as noncacheable on ARM11 MPCore
 #define POLICY_WRITE_BACK_NO_ALLOC_BUFFERED    (0b11u)
 
-#define MAKE_CUSTOM_NORM_ATTR(outer, inner)    ((1u<<12) | (outer<<10) | (inner))
+#define MAKE_CUSTOM_NORM_ATTR(outer, inner)    (1u<<12 | (outer)<<10 | (inner))
 
 // Converts the attribute bits from L1 format to L2 format
-#define L1_TO_L2(attr)                         ((attr>>6 | attr) & 0x73)
+#define L1_TO_L2(attr)                         (((attr)>>6 | (attr)) & 0x73)
 
 
 
diff --git a/source/arm11/menu/menu_func.c b/source/arm11/menu/menu_func.c
index 4fc49f7..d5a1896 100644
--- a/source/arm11/menu/menu_func.c
+++ b/source/arm11/menu/menu_func.c
@@ -164,7 +164,7 @@
 		{
 			char* text = (char*) configCopyText(key);
 			ee_printf("text: %s / u32: %lu\n", text, *(u32*) configGetData(key));
-			if (text) free(text);
+			free(text);
 		}
 	}
 	updateScreens();
diff --git a/source/arm9/hardware/timer.c b/source/arm9/hardware/timer.c
index ee302e1..dfedf4f 100644
--- a/source/arm9/hardware/timer.c
+++ b/source/arm9/hardware/timer.c
@@ -35,8 +35,8 @@
 #define REG_TIMER3_VAL    *((vu16*)(TIMER_REGS_BASE + 0x0C))
 #define REG_TIMER3_CNT    *((vu16*)(TIMER_REGS_BASE + 0x0E))
 
-#define REG_TIMER_VAL(n)  *((vu16*)(TIMER_REGS_BASE + 0x00 + (n * 4)))
-#define REG_TIMER_CNT(n)  *((vu16*)(TIMER_REGS_BASE + 0x02 + (n * 4)))
+#define REG_TIMER_VAL(n)  *((vu16*)(TIMER_REGS_BASE + 0x00 + ((n) * 4)))
+#define REG_TIMER_CNT(n)  *((vu16*)(TIMER_REGS_BASE + 0x02 + ((n) * 4)))
 
 
 // For TIMER_sleep()
diff --git a/thirdparty/fatfs/diskio.c b/thirdparty/fatfs/diskio.c
index 2bc22ba..4cd138a 100644
--- a/thirdparty/fatfs/diskio.c
+++ b/thirdparty/fatfs/diskio.c
@@ -69,8 +69,6 @@
 			if(!dev_sdcard->init()) stat = STA_NOINIT;
 			break;
 		case FATFS_DEV_NUM_TWL_NAND:
-			if(!dev_decnand->init()) stat = STA_NOINIT;
-			break;
 		case FATFS_DEV_NUM_CTR_NAND:
 			if(!dev_decnand->init()) stat = STA_NOINIT;
 			break;
@@ -167,8 +165,6 @@
 			dev = dev_sdcard;
 			break;
 		case FATFS_DEV_NUM_TWL_NAND:
-			dev = dev_decnand;
-			break;
 		case FATFS_DEV_NUM_CTR_NAND:
 			dev = dev_decnand;
 			break;