diff --git a/library/amiga_argarrayinit.c b/library/amiga_argarrayinit.c
index 373428a..0b2b517 100644
--- a/library/amiga_argarrayinit.c
+++ b/library/amiga_argarrayinit.c
@@ -1,5 +1,5 @@
 /*
- * $Id: amiga_argarrayinit.c,v 1.4 2006-01-08 12:04:22 obarthel Exp $
+ * $Id: amiga_argarrayinit.c,v 1.5 2006-09-21 09:24:20 obarthel Exp $
  *
  * :ts=4
  *
@@ -77,7 +77,7 @@ ArgArrayInit(LONG argc, CONST_STRPTR * argv)
 		for(i = 1 ; i < argc ; i++)
 			CXLIB_argarray[i-1] = argv[i];
 
-		result = (unsigned char **)CXLIB_argarray;
+		result = (STRPTR *)CXLIB_argarray;
 	}
 	else if (IconBase != NULL)
 	{
@@ -90,7 +90,7 @@ ArgArrayInit(LONG argc, CONST_STRPTR * argv)
 		if(CXLIB_disko == NULL)
 			goto out;
 
-		result = (unsigned char **)CXLIB_disko->do_ToolTypes;
+		result = (STRPTR *)CXLIB_disko->do_ToolTypes;
 	}
 
  out:
diff --git a/library/socket_ioctl.c b/library/socket_ioctl.c
index 93e4fea..573638b 100644
--- a/library/socket_ioctl.c
+++ b/library/socket_ioctl.c
@@ -1,5 +1,5 @@
 /*
- * $Id: socket_ioctl.c,v 1.11 2006-01-08 12:04:24 obarthel Exp $
+ * $Id: socket_ioctl.c,v 1.12 2006-09-21 09:24:20 obarthel Exp $
  *
  * :ts=4
  *
@@ -91,14 +91,14 @@ ioctl(int sockfd,int request, ... /* char *arg */)
 	{
 		int * option = (int *)param;
 
-		if(request == (unsigned int)FIONBIO)
+		if(request == (int)FIONBIO)
 		{
 			if((*option) != 0)
 				SET_FLAG(fd->fd_Flags,FDF_NON_BLOCKING);
 			else
 				CLEAR_FLAG(fd->fd_Flags,FDF_NON_BLOCKING);
 		}
-		else if (request == (unsigned int)FIOASYNC)
+		else if (request == (int)FIOASYNC)
 		{
 			if((*option) != 0)
 				SET_FLAG(fd->fd_Flags,FDF_ASYNC_IO);
diff --git a/library/stat_lstat.c b/library/stat_lstat.c
index 83832c4..081c706 100644
--- a/library/stat_lstat.c
+++ b/library/stat_lstat.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stat_lstat.c,v 1.13 2006-01-08 12:04:24 obarthel Exp $
+ * $Id: stat_lstat.c,v 1.14 2006-09-21 09:24:20 obarthel Exp $
  *
  * :ts=4
  *
@@ -271,7 +271,7 @@ lstat(const char * path_name, struct stat * st)
 		time(&mtime);
 
 		st->st_mode		= S_IFLNK | S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
-		st->st_dev		= (ULONG)DeviceProc((STRPTR)path_name);
+		st->st_dev		= (dev_t)DeviceProc((STRPTR)path_name);
 		st->st_size		= link_length;
 		st->st_mtime	= mtime;
 		st->st_atime	= mtime;
diff --git a/library/string_strerror_r.c b/library/string_strerror_r.c
index 7d2a2bc..9f2bf59 100644
--- a/library/string_strerror_r.c
+++ b/library/string_strerror_r.c
@@ -1,5 +1,5 @@
 /*
- * $Id: string_strerror_r.c,v 1.1 2006-09-17 17:36:42 obarthel Exp $
+ * $Id: string_strerror_r.c,v 1.2 2006-09-21 09:24:20 obarthel Exp $
  *
  * :ts=4
  *
@@ -41,7 +41,7 @@
 
 /****************************************************************************/
 
-static char * error_table[EILSEQ - EPERM + 1] =
+static const char * error_table[EILSEQ - EPERM + 1] =
 {
 	"Operation not permitted",
 	"No such file or directory",
@@ -136,7 +136,7 @@ int
 strerror_r(int number,char * buffer,size_t buffer_size)
 {
 	int result = -1;
-	char * str;
+	const char * str;
 	size_t len;
 
 	if(number < EPERM || number > EILSEQ)
diff --git a/library/systeminfo_sysinfo.c b/library/systeminfo_sysinfo.c
index 60c4543..d52642c 100644
--- a/library/systeminfo_sysinfo.c
+++ b/library/systeminfo_sysinfo.c
@@ -1,5 +1,5 @@
 /*
- * $Id: systeminfo_sysinfo.c,v 1.3 2006-07-31 13:32:35 obarthel Exp $
+ * $Id: systeminfo_sysinfo.c,v 1.4 2006-09-21 09:24:20 obarthel Exp $
  *
  * :ts=4
  *
@@ -191,7 +191,7 @@ sysinfo(int cmd,char *buf,long buflen)
 
 			#if defined(SOCKET_SUPPORT)
 			{
-				ret = snprintf(buf,buflen,"%u",gethostid());
+				ret = snprintf(buf,buflen,"%lu",gethostid());
 			}
 			#else
 			{
diff --git a/library/unistd_common_pathconf.c b/library/unistd_common_pathconf.c
index 47214ae..09f13d8 100644
--- a/library/unistd_common_pathconf.c
+++ b/library/unistd_common_pathconf.c
@@ -1,5 +1,5 @@
 /*
- * $Id: unistd_common_pathconf.c,v 1.2 2006-09-17 17:53:15 obarthel Exp $
+ * $Id: unistd_common_pathconf.c,v 1.3 2006-09-21 09:24:20 obarthel Exp $
  *
  * :ts=4
  *
@@ -173,7 +173,7 @@ __pathconf(struct MsgPort *port,int name)
 				uint32 Bufsize;
 				struct TagItem TagList[2]=
 				{
-					{DC_FHBufferR,	&Bufsize},
+					{DC_FHBufferR,	(ULONG)&Bufsize},
 					{TAG_DONE,		0}
 				};