diff --git a/arm9/source/common/unittype.h b/arm9/source/common/unittype.h
index 34cf6ac..9f350f9 100644
--- a/arm9/source/common/unittype.h
+++ b/arm9/source/common/unittype.h
@@ -3,7 +3,7 @@
 #include "common.h"
 
 // see: https://3dbrew.org/wiki/CONFIG11_Registers
-#define IS_O3DS     ((*(vu32*) 0x10140FFC) != 0x7)
+#define IS_O3DS     (((*(vu16*) 0x10140FFC) & 2) == 0)
 
 // see: https://www.3dbrew.org/wiki/Memory_layout#ARM9_ITCM
 // see: https://www.3dbrew.org/wiki/OTP_Registers#Plaintext_OTP
diff --git a/arm9/source/nand/essentials.h b/arm9/source/nand/essentials.h
index 7f92641..dbefeb3 100644
--- a/arm9/source/nand/essentials.h
+++ b/arm9/source/nand/essentials.h
@@ -37,7 +37,7 @@ typedef struct {
     u8 region;
     u8 unknown;
     char serial[0xF];
-} PACKED_STRUCT SecureInfo;
+} PACKED_ALIGN(1) SecureInfo;
 
 // includes all essential system files
 // (this is of our own making)