diff --git a/disk.c b/disk.c
index 06c7f04..c71aab3 100644
--- a/disk.c
+++ b/disk.c
@@ -185,7 +185,7 @@ convert_1970_to_filetime(uint32 high, uint32 low)
 /* optarg looks like ':h:=/mnt/floppy,b:=/mnt/usbdevice1' */
 /* when it arrives to this function.             */
 int
-disk_enum_devices(int *id, char *optarg)
+disk_enum_devices(uint32 *id, char *optarg)
 {
 	char *pos = optarg;
 	char *pos2;
diff --git a/parallel.c b/parallel.c
index 8b24503..c873fab 100644
--- a/parallel.c
+++ b/parallel.c
@@ -29,7 +29,7 @@ get_parallel_data(HANDLE handle)
 /* optarg looks like ':LPT1=/dev/lp0'            */
 /* when it arrives to this function.             */
 int
-parallel_enum_devices(int *id, char *optarg)
+parallel_enum_devices(uint32 *id, char *optarg)
 {
 	PARALLEL_DEVICE *ppar_info;
 
diff --git a/printer.c b/printer.c
index c3d0ef6..9c57ff7 100644
--- a/printer.c
+++ b/printer.c
@@ -16,7 +16,7 @@ get_printer_data(HANDLE handle)
 }
 
 int
-printer_enum_devices(int *id, char *optarg)
+printer_enum_devices(uint32 *id, char *optarg)
 {
 	PRINTER *pprinter_data;
 
diff --git a/proto.h b/proto.h
index 1f68876..c03b2db 100644
--- a/proto.h
+++ b/proto.h
@@ -31,7 +31,7 @@ NTSTATUS disk_query_information(HANDLE handle, uint32 info_class, STREAM out);
 NTSTATUS disk_set_information(HANDLE handle, uint32 info_class, STREAM in, STREAM out);
 NTSTATUS disk_query_volume_information(HANDLE handle, uint32 info_class, STREAM out);
 NTSTATUS disk_query_directory(HANDLE handle, uint32 info_class, char *pattern, STREAM out);
-int disk_enum_devices(int *id, char *optarg);
+int disk_enum_devices(uint32 *id, char *optarg);
 /* ewmhints.c */
 int get_current_workarea(uint32 * x, uint32 * y, uint32 * width, uint32 * height);
 /* iso.c */
@@ -53,9 +53,9 @@ void mcs_disconnect(void);
 void process_orders(STREAM s, uint16 num_orders);
 void reset_order_state(void);
 /* parallel.c */
-int parallel_enum_devices(int *id, char *optarg);
+int parallel_enum_devices(uint32 *id, char *optarg);
 /* printer.c */
-int printer_enum_devices(int *id, char *optarg);
+int printer_enum_devices(uint32 *id, char *optarg);
 /* printercache.c */
 int printercache_load_blob(char *printer_name, uint8 ** data);
 void printercache_process(STREAM s);
@@ -132,7 +132,7 @@ BOOL sec_connect(char *server, char *username);
 void sec_disconnect(void);
 /* serial.c */
 BOOL serial_get_timeout(uint32 handle, uint32 length, uint32 * timeout, uint32 * itv_timeout);
-int serial_enum_devices(int *id, char *optarg);
+int serial_enum_devices(uint32 *id, char *optarg);
 /* tcp.c */
 STREAM tcp_init(uint32 maxlen);
 void tcp_send(STREAM s);
diff --git a/rdpdr.c b/rdpdr.c
index a9cafe9..3f311e0 100644
--- a/rdpdr.c
+++ b/rdpdr.c
@@ -836,7 +836,7 @@ rdpdr_check_fds(fd_set * rfds, fd_set * wfds, BOOL timed_out)
 							status = STATUS_SUCCESS;
 							rdpdr_send_completion(iorq->device,
 									      iorq->id, status,
-									      iorq->partial_len, "",
+									      iorq->partial_len, (uint8*)"",
 									      1);
 
 							xfree(iorq->buffer);
@@ -872,7 +872,7 @@ rdpdr_abort_io(uint32 fd, uint32 major, NTSTATUS status)
 	struct async_iorequest *iorq;
 	struct async_iorequest *prev;
 
-	iorq = &g_iorequest;
+	iorq = g_iorequest;
 	prev = NULL;
 	while (iorq != NULL)
 	{
@@ -881,7 +881,7 @@ rdpdr_abort_io(uint32 fd, uint32 major, NTSTATUS status)
 		if ((iorq->fd == fd) && (major == 0 || iorq->major == major))
 		{
 			result = 0;
-			rdpdr_send_completion(iorq->device, iorq->id, status, result, "", 1);
+			rdpdr_send_completion(iorq->device, iorq->id, status, result, (uint8*)"", 1);
 			xfree(iorq->buffer);
 			iorq->fd = 0;
 			if (prev != NULL)
diff --git a/serial.c b/serial.c
index ae984f4..b84f993 100644
--- a/serial.c
+++ b/serial.c
@@ -327,7 +327,7 @@ set_termios(SERIAL_DEVICE * pser_inf, HANDLE serial_fd)
 /* when it arrives to this function.              */
 /* :com1=/dev/ttyS0,com2=/dev/ttyS1 */
 int
-serial_enum_devices(int *id, char *optarg)
+serial_enum_devices(uint32 *id, char *optarg)
 {
 	SERIAL_DEVICE *pser_inf;
 
diff --git a/xclip.c b/xclip.c
index a95cec6..202cfb8 100644
--- a/xclip.c
+++ b/xclip.c
@@ -310,7 +310,7 @@ ui_clip_handle_data(uint8 * data, uint32 length)
 		crlf2lf(data, &length);
 
 		/* Only send data up to null byte, if any */
-		firstnull = strchr(data, '\0');
+		firstnull = (uint8 *)strchr((char*)data, '\0');
 		if (firstnull)
 		{
 			length = firstnull - data + 1;