diff --git a/server/client_functions.c b/server/client_functions.c
index 2345dbf..126196a 100644
--- a/server/client_functions.c
+++ b/server/client_functions.c
@@ -901,7 +901,8 @@ widget_set_func (client * c, int argc, char **argv)
 		if (argc != i + 3)
 			sock_send_string (c->sock, "huh? Wrong number of arguments\n");
 		else {
-			if ((!isdigit (argv[i][0])) || (!isdigit (argv[i + 1][0]))) {
+			if ((!isdigit ((unsigned int) argv[i][0])) ||
+			    (!isdigit ((unsigned int) argv[i + 1][0]))) {
 				sock_send_string (c->sock, "huh? Invalid coordinates\n");
 			} else					  // Set all the data...
 			{
@@ -925,7 +926,8 @@ widget_set_func (client * c, int argc, char **argv)
 		if (argc != i + 3)
 			sock_send_string (c->sock, "huh? Wrong number of arguments\n");
 		else {
-			if ((!isdigit (argv[i][0])) || (!isdigit (argv[i + 1][0]))) {
+			if ((!isdigit ((unsigned int) argv[i][0])) ||
+			    (!isdigit ((unsigned int) argv[i + 1][0]))) {
 				sock_send_string (c->sock, "huh? Invalid coordinates\n");
 			} else {
 				x = atoi (argv[i]);
@@ -943,7 +945,8 @@ widget_set_func (client * c, int argc, char **argv)
 		if (argc != i + 3)
 			sock_send_string (c->sock, "huh? Wrong number of arguments\n");
 		else {
-			if ((!isdigit (argv[i][0])) || (!isdigit (argv[i + 1][0]))) {
+			if ((!isdigit ((unsigned int) argv[i][0])) ||
+			    (!isdigit ((unsigned int) argv[i + 1][0]))) {
 				sock_send_string (c->sock, "huh? Invalid coordinates\n");
 			} else {
 				x = atoi (argv[i]);
@@ -961,7 +964,8 @@ widget_set_func (client * c, int argc, char **argv)
 		if (argc != i + 3)
 			sock_send_string (c->sock, "huh? Wrong number of arguments\n");
 		else {
-			if ((!isdigit (argv[i][0])) || (!isdigit (argv[i + 1][0]))) {
+			if ((!isdigit ((unsigned int) argv[i][0])) ||
+			    (!isdigit ((unsigned int) argv[i + 1][0]))) {
 				sock_send_string (c->sock, "huh? Invalid coordinates\n");
 			} else {
 				x = atoi (argv[i]);
@@ -992,7 +996,10 @@ widget_set_func (client * c, int argc, char **argv)
 		if (argc != i + 7) {
 			sock_send_string (c->sock, "huh? Wrong number of arguments\n");
 		} else {
-			if ((!isdigit (argv[i][0])) || (!isdigit (argv[i + 1][0])) || (!isdigit (argv[i + 2][0])) || (!isdigit (argv[i + 3][0]))) {
+			if ((!isdigit ((unsigned int) argv[i][0])) ||
+			    (!isdigit ((unsigned int) argv[i + 1][0])) ||
+			    (!isdigit ((unsigned int) argv[i + 2][0])) ||
+			    (!isdigit ((unsigned int) argv[i + 3][0]))) {
 				sock_send_string (c->sock, "huh? Invalid coordinates\n");
 			} else {
 				left = atoi (argv[i]);
@@ -1035,7 +1042,12 @@ widget_set_func (client * c, int argc, char **argv)
 		if (argc != i + 8) {
 			sock_send_string (c->sock, "huh? Wrong number of arguments\n");
 		} else {
-			if ((!isdigit (argv[i][0])) || (!isdigit (argv[i + 1][0])) || (!isdigit (argv[i + 2][0])) || (!isdigit (argv[i + 3][0])) || (!isdigit (argv[i + 4][0])) || (!isdigit (argv[i + 5][0]))) {
+			if ((!isdigit ((unsigned int) argv[i][0])) ||
+			    (!isdigit ((unsigned int) argv[i + 1][0])) ||
+			    (!isdigit ((unsigned int) argv[i + 2][0])) ||
+			    (!isdigit ((unsigned int) argv[i + 3][0])) ||
+			    (!isdigit ((unsigned int) argv[i + 4][0])) ||
+			    (!isdigit ((unsigned int) argv[i + 5][0]))) {
 				sock_send_string (c->sock, "huh? Invalid coordinates\n");
 			} else {
 				left = atoi (argv[i]);
@@ -1076,9 +1088,9 @@ widget_set_func (client * c, int argc, char **argv)
 		if (argc != i + 2)
 			sock_send_string (c->sock, "huh? Wrong number of arguments\n");
 		else {
-			if (!isdigit (argv[i][0])) {
+			if (!isdigit ((unsigned int) argv[i][0])) {
 				sock_send_string (c->sock, "huh? Invalid coordinates\n");
-			} else if (!isdigit (argv[i + 1][0])) {
+			} else if (!isdigit ((unsigned int) argv[i + 1][0])) {
 				sock_send_string (c->sock, "huh? Invalid number\n");
 			} else {
 				x = atoi (argv[i]);
diff --git a/server/sock.c b/server/sock.c
index ef01aa4..363c0f8 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -12,6 +12,7 @@
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <fcntl.h>
+#include <string.h>
 
 #include "shared/sockets.h"
 #include "sock.h"