5 files changed, 10 insertions, 10 deletions
diff --git a/src/core/hs_del.c b/src/core/hs_del.c
index 15f218088..1057a4d5e 100644
--- a/src/core/hs_del.c
+++ b/src/core/hs_del.c
@@ -55,7 +55,7 @@ class CommandHSDel : public Command
 
 	void OnSyntaxError(User *u)
 	{
-		syntax_error(s_HostServ, u, "DEL", HOST_DEL_SYNTAX, s_HostServ);
+		syntax_error(s_HostServ, u, "DEL", HOST_DEL_SYNTAX);
 	}
 };
 
diff --git a/src/core/hs_delall.c b/src/core/hs_delall.c
index 5976100d2..2c749f2a2 100644
--- a/src/core/hs_delall.c
+++ b/src/core/hs_delall.c
@@ -56,13 +56,13 @@ class CommandHSDelAll : public Command
 		if (!is_host_remover(u))
 			return false;
 
-		notice_lang(s_HostServ, u, HOST_HELP_ALL);
+		notice_lang(s_HostServ, u, HOST_HELP_DELALL);
 		return true;
 	}
 
 	void OnSyntaxError(User *u)
 	{
-		syntax_error(s_HostServ, u, "DELALL", HOST_DELALL_SYNTAX, s_HostServ);
+		syntax_error(s_HostServ, u, "DELALL", HOST_DELALL_SYNTAX);
 	}
 };
 
diff --git a/src/core/hs_set.c b/src/core/hs_set.c
index 10a717ae5..6364086ce 100644
--- a/src/core/hs_set.c
+++ b/src/core/hs_set.c
@@ -152,7 +152,7 @@ class CommandHSSet : public Command
 
 	void OnSyntaxError(User *u)
 	{
-		syntax_error(s_HostServ, u, "SET", HOST_SET_SYNTAX, s_HostServ);
+		syntax_error(s_HostServ, u, "SET", HOST_SET_SYNTAX);
 	}
 };
 
diff --git a/src/core/hs_setall.c b/src/core/hs_setall.c
index df069101e..2567126fe 100644
--- a/src/core/hs_setall.c
+++ b/src/core/hs_setall.c
@@ -152,7 +152,7 @@ class CommandHSSetAll : public Command
 
 	void OnSyntaxError(User *u)
 	{
-		syntax_error(s_HostServ, u, "SETALL", HOST_SETALL_SYNTAX, s_HostServ);
+		syntax_error(s_HostServ, u, "SETALL", HOST_SETALL_SYNTAX);
 	}
 };
 
diff --git a/src/hostserv.c b/src/hostserv.c
index 07bf7c976..7d2ba950c 100644
--- a/src/hostserv.c
+++ b/src/hostserv.c
@@ -125,7 +125,7 @@ HostCore *hostCoreListHead()
  * @param time Time the vhost was Set
  * @return HostCore
  */
-HostCore *createHostCorelist(HostCore * next, char *nick, char *vIdent,
+HostCore *createHostCorelist(HostCore * next, const char *nick, char *vIdent,
 							 char *vHost, const char *creator, int32 tmp_time)
 {
 
@@ -174,7 +174,7 @@ HostCore *createHostCorelist(HostCore * next, char *nick, char *vIdent,
  * @param found If found
  * @return HostCore
  */
-HostCore *findHostCore(HostCore * phead, char *nick, bool* found)
+HostCore *findHostCore(HostCore * phead, const char *nick, bool* found)
 {
 	HostCore *previous, *current;
 
@@ -206,7 +206,7 @@ HostCore *findHostCore(HostCore * phead, char *nick, bool* found)
 }
 
 /*************************************************************************/
-HostCore *insertHostCore(HostCore * phead, HostCore * prev, char *nick,
+HostCore *insertHostCore(HostCore * phead, HostCore * prev, const char *nick,
 						 char *vIdent, char *vHost, const char *creator,
 						 int32 tmp_time)
 {
@@ -285,7 +285,7 @@ HostCore *deleteHostCore(HostCore * phead, HostCore * prev)
 }
 
 /*************************************************************************/
-void addHostCore(char *nick, char *vIdent, char *vhost, const char *creator,
+void addHostCore(const char *nick, char *vIdent, char *vhost, const char *creator,
 				 int32 tmp_time)
 {
 	HostCore *tmp;
@@ -339,7 +339,7 @@ char *getvIdent(char *nick)
 }
 
 /*************************************************************************/
-void delHostCore(char *nick)
+void delHostCore(const char *nick)
 {
 	HostCore *tmp;
 	bool found = false;