diff --git a/modules/keepnick.cpp b/modules/keepnick.cpp
index ad40b1fe..b20d82fb 100644
--- a/modules/keepnick.cpp
+++ b/modules/keepnick.cpp
@@ -121,7 +121,7 @@ public:
 			return;
 
 		m_pTimer->Stop();
-		RemTimer(m_pTimer->GetName());
+		RemTimer(m_pTimer);
 		m_pTimer = NULL;
 	}
 
diff --git a/src/znc.cpp b/src/znc.cpp
index c2a9432b..8421bf51 100644
--- a/src/znc.cpp
+++ b/src/znc.cpp
@@ -51,6 +51,11 @@ CZNC::~CZNC() {
 
 	for (map<CString,CUser*>::iterator a = m_msUsers.begin(); a != m_msUsers.end(); ++a) {
 		a->second->GetModules().UnloadAll();
+
+		const vector<CIRCNetwork*>& networks = a->second->GetNetworks();
+		for (vector<CIRCNetwork*>::const_iterator b = networks.begin(); b != networks.end(); ++b) {
+			(*b)->GetModules().UnloadAll();
+		}
 	}
 
 	for (size_t b = 0; b < m_vpListeners.size(); b++) {