diff --git a/include/arm9/timer.h b/include/arm9/timer.h
index d6f6607..efff47a 100644
--- a/include/arm9/timer.h
+++ b/include/arm9/timer.h
@@ -10,10 +10,10 @@
 #define TIMER_ENABLE        (1u<<7)
 
 // Convenience macros for calculating the ticks. Based on libnds
-#define TIMER_FREQ(n)       (0xFFFFu - (u16)(TIMER_BASE_FREQ / n) + 1)
-#define TIMER_FREQ_64(n)    (0xFFFFu - (u16)(TIMER_BASE_FREQ / 64.0 / n) + 1)
-#define TIMER_FREQ_256(n)   (0xFFFFu - (u16)(TIMER_BASE_FREQ / 256.0 / n) + 1)
-#define TIMER_FREQ_1024(n)  (0xFFFFu - (u16)(TIMER_BASE_FREQ / 1024.0 / n) + 1)
+#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/source/arm9/crypto.c b/source/arm9/crypto.c
index 76a6bd9..86d311e 100644
--- a/source/arm9/crypto.c
+++ b/source/arm9/crypto.c
@@ -76,7 +76,7 @@
 	AES_setKey(0x02, AES_KEY_X, AES_INPUT_LITTLE | AES_INPUT_REVERSED, false, (u32*)0x01FFD398);
 
 	u32 key3X[4] = {(u32)twlConsoleId, 0, 0, (u32)(twlConsoleId>>32)};
-	if(*((vu8*)0x10010014) != 0)
+	if(isDevUnit)
 	{
 		key3X[1] = 0xEE7A4B1E;
 		key3X[2] = 0xAF42C08B;