diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 65a60cfa1c..885f36830b 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,11 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2006/07/29
+	* Made the SQL ping interval default to 7 hours. [Skotlex]
+	* Made skill_unitsetting remove the group when no unit-cells were placed
+	  down. basicly this means that if landprotector blocks all tiles, the group
+	  will be removed from memory, preventing said group from counting to the
+	  total number of skills you can set. [Skotlex]
 	* Fixed segmentation fault in script engine when calling something which is not a function [Toms]
 	* Fixed segmentation fault in script engine when activating DEBUG_RUN flag [Toms]
 2006/07/28
diff --git a/conf-tmpl/inter_athena.conf b/conf-tmpl/inter_athena.conf
index 7e7b3808e0..8f62b095e4 100644
--- a/conf-tmpl/inter_athena.conf
+++ b/conf-tmpl/inter_athena.conf
@@ -68,7 +68,7 @@ read_gm_interval: 10
 // after 8 hours of inactivity).
 // 0 disables (default). Enable it only if you are getting
 // "MySQL server has gone Away" errors due to lack of activity on your server
-//connection_ping_interval: 3
+connection_ping_interval: 7
 
 // MySQL Login SQL Server
 login_server_ip: 127.0.0.1
diff --git a/db/Changelog.txt b/db/Changelog.txt
index aca987863a..fab85b40af 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -20,6 +20,8 @@
 
 =========================
 07/29
+	* Memorize cast time now can't be reduced by status changes neither.
+	  [Skotlex]
 	* Large mob_db update [Playtester]
 	- added most of the missing X.4 / 11.1 drops
 	- adjusted the drop rates of Odin Temple and Kiel's Mechanical Doll Factory
diff --git a/db/skill_castnodex_db.txt b/db/skill_castnodex_db.txt
index bf551506e8..147e1bed52 100644
--- a/db/skill_castnodex_db.txt
+++ b/db/skill_castnodex_db.txt
@@ -12,7 +12,7 @@
 336,1	//WE_CALLPARTNER
 366,1	//HW_MAGICPOWER
 370,1	//CH_PALMSTRIKE
-403,1	//PF_MEMORIZE
+403,3	//PF_MEMORIZE
 408,1	//WE_BABY
 409,1	//WE_CALLPARENT
 410,1	//WE_CALLBABY
diff --git a/src/map/skill.c b/src/map/skill.c
index bd274ec46d..6ad70db0fb 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -6775,6 +6775,11 @@ struct skill_unit_group *skill_unitsetting (struct block_list *src, int skillid,
 					unit->bl.x,unit->bl.y,group->bl_flag,&unit->bl,gettick(),1);
 		}
 	}
+	if (!group->alive_count)
+	{	//No cells? Something that was blocked completely by Land Protector?
+		skill_delunitgroup(src, group);
+		return NULL;
+	}
 	
 	return group;
 }