diff --git a/data/locale/en-US.ini b/data/locale/en-US.ini
index 8640f4e1..9673d431 100644
--- a/data/locale/en-US.ini
+++ b/data/locale/en-US.ini
@@ -4,7 +4,7 @@ AdvSceneSwitcher.windowTitle="Advanced Scene Switcher"
 # General Tab
 AdvSceneSwitcher.generalTab.title="General"
 AdvSceneSwitcher.generalTab.status="Status"
-AdvSceneSwitcher.generalTab.status.hotkeytips="Hotkeys can be defined in the OBS settings"
+AdvSceneSwitcher.generalTab.status.hotkeytips="Start/stop hotkeys can be defined in the OBS settings"
 AdvSceneSwitcher.generalTab.status.currentStatus="Advanced Scene Switcher is:"
 AdvSceneSwitcher.generalTab.status.onStartup="On startup of OBS:"
 AdvSceneSwitcher.generalTab.status.onStartup.asLastRun="Start the scene switcher if it was running"
diff --git a/lib/macro/macro-edit.cpp b/lib/macro/macro-edit.cpp
index 697ab0fd..56c3bc30 100644
--- a/lib/macro/macro-edit.cpp
+++ b/lib/macro/macro-edit.cpp
@@ -66,6 +66,8 @@ setupToolBar(const std::initializer_list<std::initializer_list<QWidget *>>
 MacroEdit::MacroEdit(QWidget *parent, QStringList helpMsg)
 	: ui(new Ui_MacroEdit)
 {
+	setParent(parent);
+
 	if (helpMsg.size() != 3) {
 		helpMsg << "AdvSceneSwitcher.macroTab.editConditionHelp"
 			<< "AdvSceneSwitcher.macroTab.editActionHelp"
diff --git a/lib/utils/plugin-state-helpers.cpp b/lib/utils/plugin-state-helpers.cpp
index 4adb46f5..1ccec22b 100644
--- a/lib/utils/plugin-state-helpers.cpp
+++ b/lib/utils/plugin-state-helpers.cpp
@@ -1,5 +1,6 @@
 #include "plugin-state-helpers.hpp"
 #include "advanced-scene-switcher.hpp"
+#include "macro-settings.hpp"
 #include "switcher-data.hpp"
 
 namespace advss {
diff --git a/lib/utils/priority-helper.cpp b/lib/utils/priority-helper.cpp
index d8dea41d..944dca17 100644
--- a/lib/utils/priority-helper.cpp
+++ b/lib/utils/priority-helper.cpp
@@ -111,6 +111,10 @@ std::vector<ThreadPrio> GetThreadPrioMapping()
 
 bool SwitcherData::PrioFuncsValid()
 {
+	if (functionNamesByPriority.empty()) {
+		return false;
+	}
+
 	auto fNBPCopy = functionNamesByPriority;
 
 	std::sort(fNBPCopy.begin(), fNBPCopy.end());