diff --git a/modules/core/m_nick.c b/modules/core/m_nick.c
index 02c2787..d007ec4 100644
--- a/modules/core/m_nick.c
+++ b/modules/core/m_nick.c
@@ -281,7 +281,7 @@ mc_nick(struct Client *client_p, struct Client *source_p, int parc, const char *
 	/* if nicks erroneous, or too long, kill */
 	if(!clean_nick(parv[1], 0))
 	{
-		ServerStats->is_kill++;
+		ServerStats.is_kill++;
 		sendto_realops_snomask(SNO_DEBUG, L_ALL,
 				     "Bad Nick: %s From: %s(via %s)",
 				     parv[1], source_p->servptr->name, client_p->name);
@@ -343,7 +343,7 @@ ms_nick(struct Client *client_p, struct Client *source_p, int parc, const char *
 	/* if nicks empty, erroneous, or too long, kill */
 	if(!clean_nick(parv[1], 0))
 	{
-		ServerStats->is_kill++;
+		ServerStats.is_kill++;
 		sendto_realops_snomask(SNO_DEBUG, L_ALL,
 				     "Bad Nick: %s From: %s(via %s)",
 				     parv[1], parv[7], client_p->name);
@@ -354,7 +354,7 @@ ms_nick(struct Client *client_p, struct Client *source_p, int parc, const char *
 	/* invalid username or host? */
 	if(!clean_username(parv[5]) || !clean_host(parv[6]))
 	{
-		ServerStats->is_kill++;
+		ServerStats.is_kill++;
 		sendto_realops_snomask(SNO_DEBUG, L_ALL,
 				     "Bad user@host: %s@%s From: %s(via %s)",
 				     parv[5], parv[6], parv[7], client_p->name);
@@ -435,7 +435,7 @@ ms_uid(struct Client *client_p, struct Client *source_p, int parc, const char *p
 	/* if nicks erroneous, or too long, kill */
 	if(!clean_nick(parv[1], 0))
 	{
-		ServerStats->is_kill++;
+		ServerStats.is_kill++;
 		sendto_realops_snomask(SNO_DEBUG, L_ALL,
 				     "Bad Nick: %s From: %s(via %s)",
 				     parv[1], source_p->name, client_p->name);
@@ -445,7 +445,7 @@ ms_uid(struct Client *client_p, struct Client *source_p, int parc, const char *p
 
 	if(!clean_username(parv[5]) || !clean_host(parv[6]))
 	{
-		ServerStats->is_kill++;
+		ServerStats.is_kill++;
 		sendto_realops_snomask(SNO_DEBUG, L_ALL,
 				     "Bad user@host: %s@%s From: %s(via %s)",
 				     parv[5], parv[6], source_p->name, client_p->name);
@@ -455,7 +455,7 @@ ms_uid(struct Client *client_p, struct Client *source_p, int parc, const char *p
 
 	if(!clean_uid(parv[8]))
 	{
-		ServerStats->is_kill++;
+		ServerStats.is_kill++;
 		sendto_realops_snomask(SNO_DEBUG, L_ALL,
 				     "Bad UID: %s From: %s(via %s)",
 				     parv[8], source_p->name, client_p->name);
@@ -527,7 +527,7 @@ ms_euid(struct Client *client_p, struct Client *source_p, int parc, const char *
 	/* if nicks erroneous, or too long, kill */
 	if(!clean_nick(parv[1], 0))
 	{
-		ServerStats->is_kill++;
+		ServerStats.is_kill++;
 		sendto_realops_snomask(SNO_DEBUG, L_ALL,
 				     "Bad Nick: %s From: %s(via %s)",
 				     parv[1], source_p->name, client_p->name);
@@ -537,7 +537,7 @@ ms_euid(struct Client *client_p, struct Client *source_p, int parc, const char *
 
 	if(!clean_username(parv[5]) || !clean_host(parv[6]))
 	{
-		ServerStats->is_kill++;
+		ServerStats.is_kill++;
 		sendto_realops_snomask(SNO_DEBUG, L_ALL,
 				     "Bad user@host: %s@%s From: %s(via %s)",
 				     parv[5], parv[6], source_p->name, client_p->name);
@@ -547,7 +547,7 @@ ms_euid(struct Client *client_p, struct Client *source_p, int parc, const char *
 
 	if(!clean_uid(parv[8]))
 	{
-		ServerStats->is_kill++;
+		ServerStats.is_kill++;
 		sendto_realops_snomask(SNO_DEBUG, L_ALL,
 				     "Bad UID: %s From: %s(via %s)",
 				     parv[8], source_p->name, client_p->name);
@@ -557,7 +557,7 @@ ms_euid(struct Client *client_p, struct Client *source_p, int parc, const char *
 
 	if(strcmp(parv[9], "*") && !clean_host(parv[9]))
 	{
-		ServerStats->is_kill++;
+		ServerStats.is_kill++;
 		sendto_realops_snomask(SNO_DEBUG, L_ALL,
 				     "Bad realhost: %s From: %s(via %s)",
 				     parv[9], source_p->name, client_p->name);
@@ -930,7 +930,7 @@ perform_nick_collides(struct Client *source_p, struct Client *client_p,
 		if (use_save)
 		{
 			save_user(&me, &me, target_p);
-			ServerStats->is_save++;
+			ServerStats.is_save++;
 			sendto_one(client_p, ":%s SAVE %s %ld", me.id,
 					uid, (long)newts);
 			register_client(client_p, source_p,
@@ -950,7 +950,7 @@ perform_nick_collides(struct Client *source_p, struct Client *client_p,
 
 			/* we then need to KILL the old client everywhere */
 			kill_client_serv_butone(NULL, target_p, "%s (Nick collision (new))", me.name);
-			ServerStats->is_kill++;
+			ServerStats.is_kill++;
 
 			target_p->flags |= FLAGS_KILLED;
 			exit_client(client_p, target_p, &me, "Nick collision (new)");
@@ -998,12 +998,12 @@ perform_nick_collides(struct Client *source_p, struct Client *client_p,
 
 			if (use_save)
 			{
-				ServerStats->is_save++;
+				ServerStats.is_save++;
 				save_user(&me, &me, target_p);
 			}
 			else
 			{
-				ServerStats->is_kill++;
+				ServerStats.is_kill++;
 				sendto_one_numeric(target_p, ERR_NICKCOLLISION,
 						form_str(ERR_NICKCOLLISION), target_p->name);
 
@@ -1047,7 +1047,7 @@ perform_nickchange_collides(struct Client *source_p, struct Client *client_p,
 
 		if (use_save)
 		{
-			ServerStats->is_save += 2;
+			ServerStats.is_save += 2;
 			save_user(&me, &me, target_p);
 			sendto_one(client_p, ":%s SAVE %s %ld", me.id,
 					source_p->id, (long)newts);
@@ -1057,13 +1057,13 @@ perform_nickchange_collides(struct Client *source_p, struct Client *client_p,
 		}
 		else
 		{
-			ServerStats->is_kill++;
+			ServerStats.is_kill++;
 			sendto_one_numeric(target_p, ERR_NICKCOLLISION,
 					form_str(ERR_NICKCOLLISION), target_p->name);
 
 			kill_client_serv_butone(NULL, source_p, "%s (Nick change collision)", me.name);
 
-			ServerStats->is_kill++;
+			ServerStats.is_kill++;
 
 			kill_client_serv_butone(NULL, target_p, "%s (Nick change collision)", me.name);
 
@@ -1095,7 +1095,7 @@ perform_nickchange_collides(struct Client *source_p, struct Client *client_p,
 
 			if (use_save)
 			{
-				ServerStats->is_save++;
+				ServerStats.is_save++;
 				/* can't broadcast a SAVE because the
 				 * nickchange has happened at client_p
 				 * but not in other directions -- jilles */
@@ -1107,7 +1107,7 @@ perform_nickchange_collides(struct Client *source_p, struct Client *client_p,
 			}
 			else
 			{
-				ServerStats->is_kill++;
+				ServerStats.is_kill++;
 
 				sendto_one_numeric(target_p, ERR_NICKCOLLISION,
 						form_str(ERR_NICKCOLLISION), target_p->name);
@@ -1140,7 +1140,7 @@ perform_nickchange_collides(struct Client *source_p, struct Client *client_p,
 
 			if (use_save)
 			{
-				ServerStats->is_save++;
+				ServerStats.is_save++;
 				save_user(&me, &me, target_p);
 			}
 			else
@@ -1151,7 +1151,7 @@ perform_nickchange_collides(struct Client *source_p, struct Client *client_p,
 				/* kill the client who existed before hand */
 				kill_client_serv_butone(client_p, target_p, "%s (Nick collision)", me.name);
 
-				ServerStats->is_kill++;
+				ServerStats.is_kill++;
 
 				target_p->flags |= FLAGS_KILLED;
 				(void) exit_client(client_p, target_p, &me, "Nick collision");
@@ -1339,7 +1339,7 @@ save_user(struct Client *client_p, struct Client *source_p,
 				"Killed %s!%s@%s for nick collision detected by %s (%s does not support SAVE)",
 				target_p->name, target_p->username, target_p->host, source_p->name, target_p->from->name);
 		kill_client_serv_butone(NULL, target_p, "%s (Nick collision (no SAVE support))", me.name);
-		ServerStats->is_kill++;
+		ServerStats.is_kill++;
 
 		target_p->flags |= FLAGS_KILLED;
 		(void) exit_client(NULL, target_p, &me, "Nick collision (no SAVE support)");
diff --git a/modules/m_sasl.c b/modules/m_sasl.c
index 451cb44..d5f8714 100644
--- a/modules/m_sasl.c
+++ b/modules/m_sasl.c
@@ -161,7 +161,7 @@ me_sasl(struct Client *client_p, struct Client *source_p,
 		else if(*parv[4] == 'S') {
 			sendto_one(target_p, form_str(RPL_SASLSUCCESS), me.name, EmptyString(target_p->name) ? "*" : target_p->name);
 			target_p->preClient->sasl_complete = 1;
-			ServerStats->is_ssuc++;
+			ServerStats.is_ssuc++;
 		}
 		*target_p->preClient->sasl_agent = '\0'; /* Blank the stored agent so someone else can answer */
 	}
@@ -179,7 +179,7 @@ abort_sasl(struct Client *data)
 		return;
 
 	data->preClient->sasl_out = data->preClient->sasl_complete = 0;
-	ServerStats->is_sbad++;
+	ServerStats.is_sbad++;
 
 	if(!IsClosing(data))
 		sendto_one(data, form_str(ERR_SASLABORTED), me.name, EmptyString(data->name) ? "*" : data->name);
diff --git a/modules/m_signon.c b/modules/m_signon.c
index 5e56f24..4d242da 100644
--- a/modules/m_signon.c
+++ b/modules/m_signon.c
@@ -276,7 +276,7 @@ ms_signon(struct Client *client_p, struct Client *source_p,
 
 	if(!clean_nick(parv[1]))
 	{
-		ServerStats->is_kill++;
+		ServerStats.is_kill++;
 		sendto_realops_snomask(SNO_DEBUG, L_ALL,
 				"Bad Nick from SIGNON: %s From: %s(via %s)",
 				parv[1], source_p->servptr->name, client_p->name);
@@ -294,7 +294,7 @@ ms_signon(struct Client *client_p, struct Client *source_p,
 
 	if(!clean_username(parv[2]) || !clean_host(parv[3]))
 	{
-		ServerStats->is_kill++;
+		ServerStats.is_kill++;
 		sendto_realops_snomask(SNO_DEBUG, L_ALL,
 				"Bad user@host from SIGNON: %s@%s From: %s(via %s)",
 				parv[2], parv[3], source_p->servptr->name, client_p->name);
@@ -338,13 +338,13 @@ ms_signon(struct Client *client_p, struct Client *source_p,
 						     source_p->name, target_p->name, target_p->from->name,
 						     client_p->name);
 		
-				ServerStats->is_kill++;
+				ServerStats.is_kill++;
 				sendto_one_numeric(target_p, ERR_NICKCOLLISION,
 						   form_str(ERR_NICKCOLLISION), target_p->name);
 		
 				kill_client_serv_butone(NULL, source_p, "%s (Nick change collision)", me.name);
 		
-				ServerStats->is_kill++;
+				ServerStats.is_kill++;
 		
 				kill_client_serv_butone(NULL, target_p, "%s (Nick change collision)", me.name);
 		
@@ -373,7 +373,7 @@ ms_signon(struct Client *client_p, struct Client *source_p,
 								     source_p->name, target_p->name,
 								     target_p->from->name, client_p->name);
 		
-					ServerStats->is_kill++;
+					ServerStats.is_kill++;
 		
 					sendto_one_numeric(target_p, ERR_NICKCOLLISION,
 							   form_str(ERR_NICKCOLLISION), target_p->name);
@@ -410,7 +410,7 @@ ms_signon(struct Client *client_p, struct Client *source_p,
 					kill_client_serv_butone(client_p, target_p, 
 							"%s (Nick collision)", me.name);
 		
-					ServerStats->is_kill++;
+					ServerStats.is_kill++;
 		
 					target_p->flags |= FLAGS_KILLED;
 					(void) exit_client(client_p, target_p, &me, "Nick collision");
diff --git a/src/parse.c b/src/parse.c
index 36976ce..b26022d 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -162,7 +162,7 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
 			/* didnt find any matching client, issue a kill */
 			if(from == NULL)
 			{
-				ServerStats->is_unpf++;
+				ServerStats.is_unpf++;
 				remove_unknown(client_p, sender, pbuffer);
 				return;
 			}
@@ -172,7 +172,7 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
 			/* fake direction, hmm. */
 			if(from->from != client_p)
 			{
-				ServerStats->is_wrdi++;
+				ServerStats.is_wrdi++;
 				cancel_clients(client_p, from, pbuffer);
 				return;
 			}
@@ -183,7 +183,7 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
 
 	if(*ch == '\0')
 	{
-		ServerStats->is_empt++;
+		ServerStats.is_empt++;
 		return;
 	}
 
@@ -204,7 +204,7 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
 	{
 		mptr = NULL;
 		numeric = ch;
-		ServerStats->is_num++;
+		ServerStats.is_num++;
 		s = ch + 3;	/* I know this is ' ' from above if */
 		*s++ = '\0';	/* blow away the ' ', and point s to next part */
 	}
@@ -248,7 +248,7 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
 						   me.name, from->name, ch);
 				}
 			}
-			ServerStats->is_unco++;
+			ServerStats.is_unco++;
 			return;
 		}
 
diff --git a/src/s_auth.c b/src/s_auth.c
index 53df4e6..1d8282c 100644
--- a/src/s_auth.c
+++ b/src/s_auth.c
@@ -243,7 +243,7 @@ auth_dns_callback(void *vptr, struct DNSReply *reply)
 static void
 auth_error(struct AuthRequest *auth)
 {
-	++ServerStats->is_abad;
+	++ServerStats.is_abad;
 
 	rb_close(auth->fd);
 	auth->fd = -1;
@@ -279,7 +279,7 @@ start_auth_query(struct AuthRequest *auth)
 		report_error("creating auth stream socket %s:%s",
 			     get_client_name(auth->client, SHOW_IP), 
 			     log_client_name(auth->client, SHOW_IP), errno);
-		++ServerStats->is_abad;
+		++ServerStats.is_abad;
 		return 0;
 	}
 
@@ -441,7 +441,7 @@ timeout_auth_queries_event(void *notused)
 			if(IsDoingAuth(auth))
 			{
 				ClearAuth(auth);
-				++ServerStats->is_abad;
+				++ServerStats.is_abad;
 				sendheader(auth->client, REPORT_FAIL_ID);
 				auth->client->localClient->auth_request = NULL;
 			}
@@ -571,14 +571,14 @@ read_auth_reply(int fd, void *data)
 
 	if(s == NULL)
 	{
-		++ServerStats->is_abad;
+		++ServerStats.is_abad;
 		strcpy(auth->client->username, "unknown");
 		sendheader(auth->client, REPORT_FAIL_ID);
 	}
 	else
 	{
 		sendheader(auth->client, REPORT_FIN_ID);
-		++ServerStats->is_asuc;
+		++ServerStats.is_asuc;
 		SetGotId(auth->client);
 	}