diff --git a/src/platform/3ds/CMakeLists.txt b/src/platform/3ds/CMakeLists.txt
index 93272ea1b..29fa4032a 100644
--- a/src/platform/3ds/CMakeLists.txt
+++ b/src/platform/3ds/CMakeLists.txt
@@ -105,7 +105,7 @@ add_custom_target(${BINARY_NAME}.3dsx ALL
 
 add_custom_target(${BINARY_NAME}.cia ALL
                   ${STRIP} -o ${BINARY_NAME}-stripped.elf ${BINARY_NAME}.elf
-                  COMMAND ${MAKEROM} -f cia -o ${BINARY_NAME}.cia -rsf cia.rsf -target t -exefslogo -elf ${BINARY_NAME}-stripped.elf -icon ${BINARY_NAME}.smdh -banner ${BINARY_NAME}.bnr
+                  COMMAND ${MAKEROM} -f cia -o ${BINARY_NAME}.cia -rsf cia.rsf -target t -exefslogo -elf ${BINARY_NAME}-stripped.elf -icon ${BINARY_NAME}.smdh -banner ${BINARY_NAME}.bnr -major ${LIB_VERSION_MAJOR} -minor ${LIB_VERSION_MINOR} -micro ${LIB_VERSION_PATCH}
                   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/cia.rsf ${BINARY_NAME}.elf ${BINARY_NAME}.smdh ${BINARY_NAME}.bnr)
 
 add_custom_target(run ${3DSLINK} ${CMAKE_CURRENT_BINARY_DIR}/${BINARY_NAME}.3dsx
diff --git a/src/platform/3ds/main.c b/src/platform/3ds/main.c
index acc152da4..559335619 100644
--- a/src/platform/3ds/main.c
+++ b/src/platform/3ds/main.c
@@ -215,7 +215,7 @@ static void _guiFinish(void) {
 }
 
 static void _setup(struct mGUIRunner* runner) {
-	bool isNew3DS;
+	bool isNew3DS = false;
 	APT_CheckNew3DS(&isNew3DS);
 	if (isNew3DS && !envIsHomebrew()) {
 		mCoreConfigSetDefaultIntValue(&runner->core->config, "threadedVideo", 1);
diff --git a/src/platform/3ds/threading.h b/src/platform/3ds/threading.h
index 8832721db..69d48c6cb 100644
--- a/src/platform/3ds/threading.h
+++ b/src/platform/3ds/threading.h
@@ -75,7 +75,7 @@ static inline int ConditionWait(Condition* cond, Mutex* mutex) {
 	MutexUnlock(&cond->mutex);
 	svcWaitSynchronization(cond->semaphore, U64_MAX);
 	MutexLock(mutex);
-	return 1;
+	return 0;
 }
 
 static inline int ConditionWaitTimed(Condition* cond, Mutex* mutex, int32_t timeoutMs) {
@@ -85,7 +85,7 @@ static inline int ConditionWaitTimed(Condition* cond, Mutex* mutex, int32_t time
 	MutexUnlock(&cond->mutex);
 	svcWaitSynchronization(cond->semaphore, timeoutMs * 10000000LL);
 	MutexLock(mutex);
-	return 1;
+	return 0;
 }
 
 static inline int ConditionWake(Condition* cond) {