diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80c134a43..0ca03d4a1 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,7 @@ option(BUILD_MANGOSD        "Build the main server"                         ON)
 option(BUILD_REALMD         "Build the login server"                        ON)
 option(BUILD_TOOLS          "Build the map/vmap/mmap extractors"            ON)
 option(SCRIPT_LIB_ELUNA     "Compile with support for Eluna scripts"        OFF)
-option(SCRIPT_LIB_SD3       "Compile with support for ScriptDev3 scripts"   ON)
+option(SCRIPT_LIB_SD3       "Compile with support for ScriptDev3 scripts"   OFF)
 #option(PLAYERBOTS           "Enable Player Bots"                            OFF)
 option(SOAP                 "Enable remote access via SOAP"                 OFF)
 # Hidden option to enable/disable PCH. DEV ONLY!
diff --git a/src/game/Object/SpellMgr.cpp b/src/game/Object/SpellMgr.cpp
index f820e44a2..3fc0ad486 100644
--- a/src/game/Object/SpellMgr.cpp
+++ b/src/game/Object/SpellMgr.cpp
@@ -5289,43 +5289,43 @@ bool SpellArea::IsFitToRequirements(Player const* player, uint32 newZone, uint32
         }
     }
     else                                                    // This block will be removed
- {
-    if (gender != GENDER_NONE)
     {
-        // not in expected gender
-        if (!player || gender != player->getGender())
+        if (gender != GENDER_NONE)
         {
-            return false;
+            // not in expected gender
+            if (!player || gender != player->getGender())
+            {
+                return false;
+            }
         }
-    }
 
-    if (raceMask)
-    {
-        // not in expected race
-        if (!player || !(raceMask & player->getRaceMask()))
+        if (raceMask)
         {
-            return false;
+            // not in expected race
+            if (!player || !(raceMask & player->getRaceMask()))
+            {
+                return false;
+            }
         }
-    }
 
-    if (questStart)
-    {
-        // not in expected required quest state
-        if (!player || (!questStartCanActive || !player->IsActiveQuest(questStart)) && !player->GetQuestRewardStatus(questStart))
+        if (questStart)
         {
-            return false;
+            // not in expected required quest state
+            if (!player || (!questStartCanActive || !player->IsActiveQuest(questStart)) && !player->GetQuestRewardStatus(questStart))
+            {
+                return false;
+            }
         }
-    }
 
-    if (questEnd)
-    {
-        // not in expected forbidden quest state
-        if (!player || player->GetQuestRewardStatus(questEnd))
+        if (questEnd)
         {
-            return false;
+            // not in expected forbidden quest state
+            if (!player || player->GetQuestRewardStatus(questEnd))
+            {
+                return false;
+            }
         }
     }
- }
 
     if (areaId)
     {
diff --git a/src/game/WorldHandlers/World.cpp b/src/game/WorldHandlers/World.cpp
index 5519f76ae..dc090f165 100644
--- a/src/game/WorldHandlers/World.cpp
+++ b/src/game/WorldHandlers/World.cpp
@@ -1603,9 +1603,10 @@ void World::SetInitialWorldSettings()
     sLog.outString("Calculate random battleground reset time...");
     InitRandomBGResetTime();
 
-    sLog.outString("Starting Game Event system...");
-    uint32 nextGameEvent = sGameEventMgr.Initialize();
-    m_timers[WUPDATE_EVENTS].SetInterval(nextGameEvent);    // depend on next event
+    sLog.outString("Starting Game Event system...BROKEN");
+    // TODO: Needs Fixing
+    // uint32 nextGameEvent = sGameEventMgr.Initialize();
+    // m_timers[WUPDATE_EVENTS].SetInterval(nextGameEvent);    // depend on next event
 
     // ToDo: requires fix after the latest updates
     //sLog.outString("Loading grids for active creatures or transports...");
diff --git a/src/shared/revision.h b/src/shared/revision.h
index 40fad162c..110ef335e 100644
--- a/src/shared/revision.h
+++ b/src/shared/revision.h
@@ -38,6 +38,6 @@
 
     #define WORLD_DB_VERSION_NR 21
     #define WORLD_DB_STRUCTURE_NR 11
-    #define WORLD_DB_CONTENT_NR 012
-    #define WORLD_DB_UPDATE_DESCRIPTION "gossip_option_condition"
+    #define WORLD_DB_CONTENT_NR 041
+    #define WORLD_DB_UPDATE_DESCRIPTION "initial_cleanup_part3"
 #endif // __REVISION_H__