diff --git a/common/crash.cpp b/common/crash.cpp
index 522d5f171..155bfcf2a 100644
--- a/common/crash.cpp
+++ b/common/crash.cpp
@@ -111,7 +111,60 @@ void set_exception_handler() {
 	SetUnhandledExceptionFilter(windows_exception_handler);
 }
 #else
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <sys/fcntl.h>
+
+void print_trace()
+{
+	auto uid = geteuid();
+
+	std::string temp_output_file = "/tmp/dump-output";
+
+	char pid_buf[30];
+	sprintf(pid_buf, "%d", getpid());
+	char name_buf[512];
+	name_buf[readlink("/proc/self/exe", name_buf, 511)] = 0;
+	int child_pid = fork();
+	if (!child_pid) {
+		int fd = open(temp_output_file.c_str(), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
+
+		dup2(fd, 1); // redirect output to stderr
+		fprintf(stdout, "stack trace for %s pid=%s\n", name_buf, pid_buf);
+		if (uid == 0) {
+			execlp("gdb", "gdb", "--batch", "-n", "-ex", "thread", "-ex", "bt", name_buf, pid_buf, NULL);
+		}
+		else {
+			execlp("sudo", "gdb", "gdb", "--batch", "-n", "-ex", "thread", "-ex", "bt", name_buf, pid_buf, NULL);
+		}
+
+		close(fd);
+
+		abort(); /* If gdb failed to start */
+	}
+	else {
+		waitpid(child_pid, NULL, 0);
+	}
+
+	std::ifstream    input(temp_output_file);
+	for (std::string line; getline(input, line);) {
+		LogCrash("{}", line);
+	}
+
+	std::remove(temp_output_file.c_str());
+
+	exit(1);
+}
+
 // crash is off or an unhandled platform
-void set_exception_handler() {
+void set_exception_handler()
+{
+	signal(SIGABRT, reinterpret_cast<void (*)(int)>(print_trace));
+	signal(SIGFPE, reinterpret_cast<void (*)(int)>(print_trace));
+	signal(SIGFPE, reinterpret_cast<void (*)(int)>(print_trace));
+	signal(SIGSEGV, reinterpret_cast<void (*)(int)>(print_trace));
 }
 #endif
diff --git a/loginserver/world_server.cpp b/loginserver/world_server.cpp
index c2c99abd8..42f4f742f 100644
--- a/loginserver/world_server.cpp
+++ b/loginserver/world_server.cpp
@@ -924,8 +924,9 @@ bool WorldServer::HandleNewLoginserverInfoUnregisteredAllowed(
 			this->GetServerShortName()
 		);
 
+		this->SetIsServerAuthorized(true);
+
 		if (world_registration.loaded) {
-			this->SetIsServerAuthorized(true);
 			return true;
 		}
 
diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp
index 2b5702af4..0c1306577 100644
--- a/zone/client_packet.cpp
+++ b/zone/client_packet.cpp
@@ -4551,7 +4551,7 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) {
 		MakeSpawnUpdate(position_update);
 	
 		if (gm_hide_me) {
-			entity_list.QueueClientsStatus(this, outapp, true, Admin(), 250);
+			entity_list.QueueClientsStatus(this, outapp, true, Admin(), 255);
 		} else {
 			entity_list.QueueCloseClients(this, outapp, true, RuleI(Range, ClientPositionUpdates), nullptr, true);
 		}
diff --git a/zone/perl_npc.cpp b/zone/perl_npc.cpp
index 97dc889e1..2dae9e776 100644
--- a/zone/perl_npc.cpp
+++ b/zone/perl_npc.cpp
@@ -2163,6 +2163,48 @@ XS(XS_NPC_GetScore) {
 	XSRETURN(1);
 }
 
+XS(XS_NPC_MerchantOpenShop);
+XS(XS_NPC_MerchantOpenShop) {
+	dXSARGS;
+	if (items != 1)
+		Perl_croak(aTHX_ "Usage: NPC::MerchantOpenShop(THIS)");
+	{
+		NPC *THIS;
+		dXSTARG;
+		if (sv_derived_from(ST(0), "NPC")) {
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(NPC *, tmp);
+		} else
+			Perl_croak(aTHX_ "THIS is not of type NPC");
+		if (THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
+
+		THIS->MerchantOpenShop();
+	}
+	XSRETURN_EMPTY;
+}
+
+XS(XS_NPC_MerchantCloseShop);
+XS(XS_NPC_MerchantCloseShop) {
+	dXSARGS;
+	if (items != 1)
+		Perl_croak(aTHX_ "Usage: NPC::MerchantCloseShop(THIS)");
+	{
+		NPC *THIS;
+		dXSTARG;
+		if (sv_derived_from(ST(0), "NPC")) {
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(NPC *, tmp);
+		} else
+			Perl_croak(aTHX_ "THIS is not of type NPC");
+		if (THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
+
+		THIS->MerchantCloseShop();
+	}
+	XSRETURN_EMPTY;
+}
+
 XS(XS_NPC_AddMeleeProc);
 XS(XS_NPC_AddMeleeProc) {
 	dXSARGS;
@@ -2511,6 +2553,8 @@ XS(boot_NPC) {
 	newXSproto(strcpy(buf, "GetAvoidanceRating"), XS_NPC_GetAvoidanceRating, file, "$");
 	newXSproto(strcpy(buf, "GetSpawnKillCount"), XS_NPC_GetSpawnKillCount, file, "$");
 	newXSproto(strcpy(buf, "GetScore"), XS_NPC_GetScore, file, "$");
+	newXSproto(strcpy(buf, "MerchantOpenShop"), XS_NPC_MerchantOpenShop, file, "$");
+	newXSproto(strcpy(buf, "MerchantCloseShop"), XS_NPC_MerchantCloseShop, file, "$");
 	newXSproto(strcpy(buf, "AddMeleeProc"), XS_NPC_AddMeleeProc, file, "$$$");
 	newXSproto(strcpy(buf, "AddRangedProc"), XS_NPC_AddRangedProc, file, "$$$");
 	newXSproto(strcpy(buf, "AddDefensiveProc"), XS_NPC_AddDefensiveProc, file, "$$$");