4 files changed, 10 insertions, 6 deletions
diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 5b1562e18..c7b5700d2 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -245,12 +245,13 @@ class ModuleJoinFlood : public Module
 
 	virtual ~ModuleJoinFlood()
 	{
+		ServerInstance->Modes->DelMode(jf);
 		DELETE(jf);
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+		return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index d64c60d56..fddcae288 100644
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -119,8 +119,8 @@ public:
 				if (!dl->size())
 				{
 					// Now it's empty..
-						DELETE(dl);
-						chan->Shrink("norejoinusers");
+					DELETE(dl);
+					chan->Shrink("norejoinusers");
 				}
 			}
 		}
@@ -167,12 +167,13 @@ public:
 
 	virtual ~ModuleKickNoRejoin()
 	{
+		ServerInstance->Modes->DelMode(kr);
 		DELETE(kr);
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_STATIC | VF_VENDOR);
+		return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index 3eccb868d..7deb77a69 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -264,12 +264,13 @@ class ModuleMsgFlood : public Module
 
 	virtual ~ModuleMsgFlood()
 	{
+		ServerInstance->Modes->DelMode(mf);
 		DELETE(mf);
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+		return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index dbf6f1127..efd9b8b1c 100644
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -139,12 +139,13 @@ class ModuleRedirect : public Module
 
 	virtual ~ModuleRedirect()
 	{
+		ServerInstance->Modes->DelMode(re);
 		DELETE(re);
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+		return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR);
 	}
 };