diff --git a/Makefile b/Makefile
index ba1b081..c2ceef8 100644
--- a/Makefile
+++ b/Makefile
@@ -35,8 +35,8 @@ include $(DEVKITARM)/3ds_rules
 # External tools
 #---------------------------------------------------------------------------------
 ifeq ($(OS),Windows_NT)
-MAKEROM 	?= ../makerom.exe
-BANNERTOOL 	?= ../bannertool.exe
+MAKEROM 	?= makerom.exe
+BANNERTOOL 	?= bannertool.exe
 
 else
 MAKEROM 	?= makerom
@@ -262,12 +262,12 @@ all: $(OUTPUT).cia $(OUTPUT).elf $(OUTPUT).3dsx
 $(OUTPUT).elf	:	$(OFILES)
 
 $(OUTPUT).cia	:	$(OUTPUT).elf $(OUTPUT).smdh
-	$(BANNERTOOL) makebanner -i "../app/banner.png" -a "../app/BannerAudio.wav" -o "../app/banner.bin"
+	@$(BANNERTOOL) makebanner -i "../app/banner.png" -a "../app/BannerAudio.wav" -o "../app/banner.bin"
 
-	$(BANNERTOOL) makesmdh -i "../app/icon.png" -s "$(TARGET)" -l "$(APP_DESCRIPTION)" -p "$(APP_AUTHOR)" -o "../app/icon.bin" \
+	@$(BANNERTOOL) makesmdh -i "../app/icon.png" -s "$(TARGET)" -l "$(APP_DESCRIPTION)" -p "$(APP_AUTHOR)" -o "../app/icon.bin" \
 		--flags visible,ratingrequired,recordusage --cero 153 --esrb 153 --usk 153 --pegigen 153 --pegiptr 153 --pegibbfc 153 --cob 153 --grb 153 --cgsrr 153
 
-	$(MAKEROM) -f cia -target t -exefslogo -o "../$(TARGET).cia" -elf "../$(TARGET).elf" -rsf "../app/build-cia.rsf" -banner "../app/banner.bin" -icon "../app/icon.bin" -logo "../app/logo.bcma.lz" -DAPP_ROMFS="$(TOPDIR)/$(ROMFS)" -major $(VERSION_MAJOR) -minor $(VERSION_MINOR) -micro $(VERSION_MICRO) -DAPP_VERSION_MAJOR="$(VERSION_MAJOR)"
+	@$(MAKEROM) -f cia -target t -exefslogo -o "../$(TARGET).cia" -elf "../$(TARGET).elf" -rsf "../app/build-cia.rsf" -banner "../app/banner.bin" -icon "../app/icon.bin" -logo "../app/logo.bcma.lz" -DAPP_ROMFS="$(TOPDIR)/$(ROMFS)" -major $(VERSION_MAJOR) -minor $(VERSION_MINOR) -micro $(VERSION_MICRO) -DAPP_VERSION_MAJOR="$(VERSION_MAJOR)"
 #---------------------------------------------------------------------------------
 # you need a rule like this for each extension you use as binary data
 #---------------------------------------------------------------------------------
diff --git a/source/init.cpp b/source/init.cpp
index c9b70fa..cc15e82 100644
--- a/source/init.cpp
+++ b/source/init.cpp
@@ -196,6 +196,10 @@ Result Init::MainLoop() {
 
 		if (!exiting) Gui::ScreenLogic(hDown, hHeld, touch, true, false);
 
+		if (aptCheckHomePressRejected()) {
+			if (Msg::promptMsg(Lang::get("FEATURE_SIDE_EFFECTS"))) aptSetHomeAllowed(true);
+		};
+
 		if (exiting) {
 			if (hDown & KEY_START) fullExit = true; // Make it optionally faster.
 
diff --git a/source/utils/queueSystem.cpp b/source/utils/queueSystem.cpp
index 713e06f..2886344 100644
--- a/source/utils/queueSystem.cpp
+++ b/source/utils/queueSystem.cpp
@@ -63,6 +63,7 @@ void QueueSystem::AddToQueue(nlohmann::json obj, const C2D_Image &icn, const std
 
 		svcGetThreadPriority(&prio, CUR_THREAD_HANDLE);
 		queueThread = threadCreate((ThreadFunc)QueueSystem::QueueHandle, NULL, 64 * 1024, prio - 1, -2, false);
+		aptSetHomeAllowed(false);
 	}
 }
 
@@ -84,6 +85,7 @@ void QueueSystem::ClearQueue() {
 	Use this, to go back to the queue after the Request.
 */
 void QueueSystem::Resume() {
+	aptSetHomeAllowed(false);
 	QueueSystem::Wait = false;
 	QueueRuns = true;
 
@@ -388,4 +390,6 @@ void QueueSystem::QueueHandle() {
 			ret = NONE; // Reset.
 		}
 	}
+
+	aptSetHomeAllowed(true);
 }
\ No newline at end of file