diff --git a/Makefile b/Makefile
index 0e6526d4a..38cb70b3c 100644
--- a/Makefile
+++ b/Makefile
@@ -109,6 +109,7 @@ dist-bin: all
 	@tar --exclude=*~ -cjf wut-$(VERSION).tar.bz2 \
 		include lib share \
 		-C libraries/libwhb include \
+		-C ../nn_idb include \
 		-C ../libgfd include \
 		-C ../libirc include
 
diff --git a/libraries/nn_idb/src/IDBReader.cpp b/libraries/nn_idb/src/IDBReader.cpp
index c6828641f..66b111e92 100644
--- a/libraries/nn_idb/src/IDBReader.cpp
+++ b/libraries/nn_idb/src/IDBReader.cpp
@@ -83,9 +83,8 @@ namespace nn::idb {
 
     bool IDBReader::Initialize() {
         uint64_t menuTid = _SYSGetSystemApplicationTitleId(SYSTEM_APP_ID_WII_U_MENU);
-        auto *menuTidPtr = (uint32_t *) menuTid;
         char path[90];
-        snprintf(path, sizeof(path), "fs:/vol/storage_mlc01/usr/save/%08X/%08X/user/common/BaristaIconDataBase.dat", menuTidPtr[0], menuTidPtr[1]);
+        snprintf(path, sizeof(path), "fs:/vol/storage_mlc01/usr/save/%08X/%08X/user/common/BaristaIconDataBase.dat", (uint32_t) (menuTid >> 32), (uint32_t) (menuTid & 0xffffffff));
 
         return Initialize(path);
     }