diff --git a/modules/commands/cs_info.cpp b/modules/commands/cs_info.cpp
index e7c8e039e..b58158576 100644
--- a/modules/commands/cs_info.cpp
+++ b/modules/commands/cs_info.cpp
@@ -100,7 +100,7 @@ class CommandCSInfo : public Command
 		}
 		if (ci->HasFlag(CI_SUSPENDED))
 		{
-			Anope::string *by = ci->GetExt<Anope::string *>("suspend_by"), *reason = ci->GetExt<Anope::string *>("suspend_reason");
+			Anope::string *by = ci->GetExt<ExtensibleString *>("suspend_by"), *reason = ci->GetExt<ExtensibleString *>("suspend_reason");
 			if (by != NULL)
 				source.Reply(_("      Suspended: [%s] %s"), by->c_str(), (reason && !reason->empty() ? reason->c_str() : NO_REASON));
 		}
diff --git a/modules/commands/cs_suspend.cpp b/modules/commands/cs_suspend.cpp
index ac5437e16..f076ae361 100644
--- a/modules/commands/cs_suspend.cpp
+++ b/modules/commands/cs_suspend.cpp
@@ -167,7 +167,7 @@ class CommandCSUnSuspend : public Command
 			return;
 		}
 
-		Anope::string *by = ci->GetExt<Anope::string *>("suspend_by"), *reason = ci->GetExt<Anope::string *>("suspend_reason");
+		Anope::string *by = ci->GetExt<ExtensibleString *>("suspend_by"), *reason = ci->GetExt<ExtensibleString *>("suspend_reason");
 		if (by != NULL)
 			Log(LOG_ADMIN, u, this, ci) << " which was suspended by " << *by << " for: " << (reason && !reason->empty() ? *reason : "No reason");
 
diff --git a/modules/commands/ns_register.cpp b/modules/commands/ns_register.cpp
index 303321551..44d3c5e22 100644
--- a/modules/commands/ns_register.cpp
+++ b/modules/commands/ns_register.cpp
@@ -46,7 +46,7 @@ class CommandNSConfirm : public Command
 		}
 		else if (u->Account())
 		{
-			Anope::string *code = u->Account()->GetExt<Anope::string *>("ns_register_passcode");
+			Anope::string *code = u->Account()->GetExt<ExtensibleString *>("ns_register_passcode");
 			if (code != NULL && *code == passcode)
 			{
 				u->Account()->Shrink("ns_register_passcode");
@@ -324,7 +324,7 @@ class NSRegister : public Module
 
 static bool SendRegmail(User *u, NickAlias *na, BotInfo *bi)
 {
-	Anope::string *code = na->nc->GetExt<Anope::string *>("ns_register_passcode");
+	Anope::string *code = na->nc->GetExt<ExtensibleString *>("ns_register_passcode");
 	Anope::string codebuf;
 	if (code == NULL)
 	{
diff --git a/modules/commands/ns_set_email.cpp b/modules/commands/ns_set_email.cpp
index e86338075..01310bcbb 100644
--- a/modules/commands/ns_set_email.cpp
+++ b/modules/commands/ns_set_email.cpp
@@ -163,7 +163,7 @@ class NSSetEmail : public Module
 		User *u = source.u;
 		if (command->name == "nickserv/confirm" && !params.empty() && u->IsIdentified())
 		{
-			Anope::string *new_email = u->Account()->GetExt<Anope::string *>("ns_set_email"), *passcode = u->Account()->GetExt<Anope::string *>("ns_set_email_passcode");
+			Anope::string *new_email = u->Account()->GetExt<ExtensibleString *>("ns_set_email"), *passcode = u->Account()->GetExt<ExtensibleString *>("ns_set_email_passcode");
 			if (new_email && passcode)
 			{
 				if (params[0] == *passcode)
diff --git a/modules/database/db_plain.cpp b/modules/database/db_plain.cpp
index 711434336..4ac109018 100644
--- a/modules/database/db_plain.cpp
+++ b/modules/database/db_plain.cpp
@@ -767,7 +767,7 @@ class DBPlain : public Module
 				db_buffer << "MD FLAGS " << ci->ToString() << endl;
 			if (ci->HasFlag(CI_SUSPENDED))
 			{
-				Anope::string *by = ci->GetExt<Anope::string *>("suspend_by"), *reason = ci->GetExt<Anope::string *>("suspend_reason");
+				Anope::string *by = ci->GetExt<ExtensibleString *>("suspend_by"), *reason = ci->GetExt<ExtensibleString *>("suspend_reason");
 				if (by && reason)
 					db_buffer << "MD SUSPEND " << *by << " :" << *reason << endl;
 			}
diff --git a/modules/protocol/inspircd11.cpp b/modules/protocol/inspircd11.cpp
index 88371759b..4c1776097 100644
--- a/modules/protocol/inspircd11.cpp
+++ b/modules/protocol/inspircd11.cpp
@@ -322,7 +322,7 @@ class InspircdIRCdMessage : public IRCdMessage
 				user->SetCloakedHost(params[3]);
 
 				NickAlias *na = findnick(user->nick);
-				Anope::string *svidbuf = na ? na->nc->GetExt<Anope::string *>("authenticationtoken") : NULL;
+				Anope::string *svidbuf = na ? na->nc->GetExt<ExtensibleString *>("authenticationtoken") : NULL;
 				if (na && svidbuf && *svidbuf == params[0])
 				{
 					user->Login(na->nc);