diff --git a/src/map/achievement.cpp b/src/map/achievement.cpp
index bc8277c740..34988573af 100644
--- a/src/map/achievement.cpp
+++ b/src/map/achievement.cpp
@@ -188,7 +188,7 @@ uint64 AchievementDatabase::parseBodyNode(const YAML::Node &node){
 		}
 
 		if( achievement->condition ){
-			aFree( achievement->condition );
+			script_free_code( achievement->condition );
 			achievement->condition = nullptr;
 		}
 
@@ -278,7 +278,7 @@ uint64 AchievementDatabase::parseBodyNode(const YAML::Node &node){
 			}
 
 			if( achievement->rewards.script ){
-				aFree( achievement->rewards.script );
+				script_free_code( achievement->rewards.script );
 				achievement->rewards.script = nullptr;
 			}
 
diff --git a/src/map/pet.cpp b/src/map/pet.cpp
index 73fb8b159b..af1c9180b5 100644
--- a/src/map/pet.cpp
+++ b/src/map/pet.cpp
@@ -374,7 +374,7 @@ uint64 PetDatabase::parseBodyNode( const YAML::Node &node ){
 		}
 
 		if( pet->pet_bonus_script != nullptr ){
-			aFree( pet->pet_bonus_script );
+			script_free_code( pet->pet_bonus_script );
 			pet->pet_bonus_script = nullptr;
 		}
 
@@ -393,7 +393,7 @@ uint64 PetDatabase::parseBodyNode( const YAML::Node &node ){
 		}
 
 		if( pet->pet_support_script != nullptr ){
-			aFree( pet->pet_support_script );
+			script_free_code( pet->pet_support_script );
 			pet->pet_support_script = nullptr;
 		}
 
diff --git a/src/map/quest.cpp b/src/map/quest.cpp
index 47d4218c23..a9df0bbedf 100644
--- a/src/map/quest.cpp
+++ b/src/map/quest.cpp
@@ -902,4 +902,5 @@ void do_init_quest(void)
  */
 void do_final_quest(void)
 {
+	quest_db.clear();
 }