diff --git a/Ircu.c b/Ircu.c
index 388b73a2..32c11e88 100644
--- a/Ircu.c
+++ b/Ircu.c
@@ -54,30 +54,29 @@ const char services_bot_modes[]= "+oS";
 /* this is the command list and associated functions to run */
 ircd_cmd cmd_list[] = {
 	/* Command      Function                srvmsg */
-	{MSG_PRIVATE, m_privmsg, 0},
-	{TOK_PRIVATE, m_privmsg, 0},
-	{MSG_CPRIVMSG, m_privmsg, 0},
-	{TOK_CPRIVMSG, m_privmsg, 0},
-	{MSG_NOTICE, m_notice, 0},
-	{MSG_STATS, m_stats, 0},
-	{MSG_VERSION, m_version, 0},
-	{MSG_MOTD, m_motd, 0},
-	{MSG_ADMIN, m_admin, 0},
-	{MSG_SERVER, m_server, 0},
-	{MSG_SQUIT, m_squit, 0},
-	{MSG_QUIT, m_quit, 0},
-	{MSG_MODE, m_mode, 0},
-	{MSG_KILL, m_kill, 0},
-	{MSG_PONG, m_pong, 0},
-	{MSG_AWAY, m_away, 0},
-	{MSG_NICK, m_nick, 0},
-	{MSG_TOPIC, m_topic, 0},
-	{MSG_KICK, m_kick, 0},
-	{MSG_JOIN, m_join, 0},
-	{MSG_PART, m_part, 0},
-	{MSG_PING, m_ping, 0},
-	{MSG_PASS, m_pass, 0},
-	{MSG_END_OF_BURST, m_burst, 0},
+	{MSG_PRIVATE, TOK_PRIVATE, m_privmsg, 0},
+	{MSG_CPRIVMSG, TOK_CPRIVMSG, m_privmsg, 0},
+	{MSG_NOTICE, TOK_NOTICE, m_notice, 0},
+	{MSG_CNOTICE, TOK_CNOTICE, m_notice, 0},
+	{MSG_STATS, TOK_STATS, m_stats, 0},
+	{MSG_VERSION, TOK_VERSION, m_version, 0},
+	{MSG_MOTD, TOK_MOTD, m_motd, 0},
+	{MSG_ADMIN, TOK_ADMIN, m_admin, 0},
+	{MSG_SERVER, TOK_SERVER, m_server, 0},
+	{MSG_SQUIT, TOK_SQUIT, m_squit, 0},
+	{MSG_QUIT, TOK_QUIT, m_quit, 0},
+	{MSG_MODE, TOK_MODE, m_mode, 0},
+	{MSG_KILL, TOK_KILL, m_kill, 0},
+	{MSG_PONG, TOK_PONG, m_pong, 0},
+	{MSG_AWAY, TOK_AWAY, m_away, 0},
+	{MSG_NICK, TOK_NICK, m_nick, 0},
+	{MSG_TOPIC, TOK_TOPIC, m_topic, 0},
+	{MSG_KICK, TOK_KICK, m_kick, 0},
+	{MSG_JOIN, TOK_JOIN, m_join, 0},
+	{MSG_PART, TOK_PART, m_part, 0},
+	{MSG_PING, TOK_PING, m_ping, 0},
+	{MSG_PASS, TOK_PASS, m_pass, 0},
+	{MSG_END_OF_BURST, TOK_END_OF_BURST, m_burst, 0},
 };
 
 ChanModes chan_modes[] = {
diff --git a/Ircu.h b/Ircu.h
index 24afa493..1bcf50bf 100644
--- a/Ircu.h
+++ b/Ircu.h
@@ -31,8 +31,8 @@
 /* The following defines might not be correct for IRCu but are used to 
  * ensure NeoStats compiles correctly until we get updated files */
 
-/* we don't support tokens */
-#undef GOTTOKENSUPPORT
+/* we support tokens */
+#define GOTTOKENSUPPORT
 /* we don't support CLIENT */
 #undef GOTCLIENTSUPPORT
 /* we don't support svstime */
diff --git a/configure b/configure
index f73ace1f..74af0b9c 100755
--- a/configure
+++ b/configure
@@ -6511,28 +6511,6 @@ echo $ECHO_N "checking The Modules that will be compiled... $ECHO_C" >&6
 echo "$as_me:$LINENO: result: $MODULES" >&5
 echo "${ECHO_T}$MODULES" >&6
 
-if test "$prefix" = "NONE"; then
-	cat >>confdefs.h <<_ACEOF
-#define NEOPREFIX "$DIRINST"
-_ACEOF
-
-	echo "$as_me:$LINENO: result: Prefix" >&5
-echo "${ECHO_T}Prefix" >&6
-	echo "$as_me:$LINENO: result: $prefix" >&5
-echo "${ECHO_T}$prefix" >&6
-	echo "$as_me:$LINENO: result: $DIRINST" >&5
-echo "${ECHO_T}$DIRINST" >&6
-else
-	cat >>confdefs.h <<_ACEOF
-#define NEOPREFIX "${prefix}"
-_ACEOF
-
-	echo "$as_me:$LINENO: result: $prefix" >&5
-echo "${ECHO_T}$prefix" >&6
-	echo "$as_me:$LINENO: result: $DIRINST" >&5
-echo "${ECHO_T}$DIRINST" >&6
-fi
-
 
 
 
diff --git a/ircd.c b/ircd.c
index 2927d484..9949c692 100644
--- a/ircd.c
+++ b/ircd.c
@@ -579,7 +579,11 @@ m_privmsg (char* origin, char **av, int ac, int cmdptr)
  *
  * @return none
  */
+#ifdef IRCU
+void 
+#else
 static void 
+#endif
 process_ircd_cmd (int cmdptr, char *cmd, char* origin, char **av, int ac)
 {
 	int i;
@@ -1166,6 +1170,7 @@ ssvskill_cmd (const char *target, const char *reason, ...)
 	return NS_SUCCESS;
 }
 
+#ifdef GOTSVSTIME
 int 
 ssvstime_cmd (const time_t ts)
 {
@@ -1173,6 +1178,7 @@ ssvstime_cmd (const time_t ts)
 	nlog (LOG_NOTICE, LOG_CORE, "ssvstime_cmd: synching server times to %ld", (int)ts);
 	return NS_SUCCESS;
 }
+#endif
 
 int
 skick_cmd (const char *who, const char *chan, const char *target, const char *reason)