diff --git a/common/SocketLib/HttpdForm.cpp b/common/SocketLib/HttpdForm.cpp
index d0eece3f1..cf7375ce9 100644
--- a/common/SocketLib/HttpdForm.cpp
+++ b/common/SocketLib/HttpdForm.cpp
@@ -80,7 +80,7 @@ HttpdForm::HttpdForm(IFile *infil) : raw(false)
 			std::string content_type;
 			std::string current_name;
 			std::string current_filename;
-			char slask[200];
+			char slask[2000];
 			infil -> fgets(slask, 200);
 			while (!infil -> eof())
 			{
diff --git a/common/opcodemgr.cpp b/common/opcodemgr.cpp
index 5eba9aaa0..bdfdeaac4 100644
--- a/common/opcodemgr.cpp
+++ b/common/opcodemgr.cpp
@@ -140,8 +140,8 @@ RegularOpcodeManager::RegularOpcodeManager()
 }
 
 RegularOpcodeManager::~RegularOpcodeManager() {
-	safe_delete(emu_to_eq);
-	safe_delete(eq_to_emu);
+	safe_delete_array(emu_to_eq);
+	safe_delete_array(eq_to_emu);
 }
 
 bool RegularOpcodeManager::LoadOpcodes(const char *filename, bool report_errors) {
diff --git a/zone/command.cpp b/zone/command.cpp
index df56c3222..d97717547 100644
--- a/zone/command.cpp
+++ b/zone/command.cpp
@@ -11629,5 +11629,5 @@ void command_augmentitem(Client *c, const Seperator *sep)
 		in_augment->augment_slot = -1;
 		if(c->GetTradeskillObject() != NULL)
 		Object::HandleAugmentation(c, in_augment, c->GetTradeskillObject());
-		safe_delete(in_augment);
+		safe_delete_array(in_augment);
 }
diff --git a/zone/merc.cpp b/zone/merc.cpp
index 01a4ff1b4..6ef8cc8bf 100644
--- a/zone/merc.cpp
+++ b/zone/merc.cpp
@@ -5450,7 +5450,7 @@ void NPC::LoadMercTypes(){
 		mysql_free_result(DatasetResult);
 	}
 
-	safe_delete(Query);
+	safe_delete_array(Query);
 	Query = 0;
 
 	if(!errorMessage.empty()) {
@@ -5486,7 +5486,7 @@ void NPC::LoadMercs(){
 		mysql_free_result(DatasetResult);
 	}
 
-	safe_delete(Query);
+	safe_delete_array(Query);
 	Query = 0;
 
 	if(!errorMessage.empty()) {
diff --git a/zone/parser.cpp b/zone/parser.cpp
index d11f2e820..79e97917a 100644
--- a/zone/parser.cpp
+++ b/zone/parser.cpp
@@ -1094,7 +1094,7 @@ int Parser::LoadScript(int npcid, const char * zone, Mob* activater)
 				buffer.replace(buffer.length()-1,buffer.length(),"");
 				int heh = ParseCommands(buffer,line_num,0,0,0,0,filename);
 				if (!heh){
-					safe_delete_array(NewEventList);
+					safe_delete(NewEventList);
 					return 0;
 				}
 				event1->command = buffer;